Merge branch 'master' of https://lars.pandikow@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostage.git

project.properties

@@ -15,4 +15,4 @@ target=android-19
 android.library=false
 
 
-android.library.reference.1=../google-play-services_lib
+android.library.reference.1=../../development/Android/HosTaGe/google-play-services_lib

src/de/tudarmstadt/informatik/hostage/wrapper/Packet.java

@@ -58,7 +58,8 @@ public class Packet {
 	public String toString() {
 		if (protocol.equals("FTP") 
 				|| protocol.equals("HTTP") 
-				|| protocol.equals("HTTPS")) {
+				|| protocol.equals("HTTPS")
+				|| protocol.equals("SIP")) {
 			return new String(payload);
 		} else {
 			return HelperUtils.bytesToHexString(payload);