commented out code with bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	yasme/src/main/java/de/fau/cs/mad/yasme/android/ui/ChatListAdapter.java
	yasme/src/main/java/de/fau/cs/mad/yasme/android/ui/fragments/ChatSettingsAdd.java
	yasme/src/main/java/de/fau/cs/mad/yasme/android/ui/fragments/ChatSettingsInfo.java
	yasme/src/main/java/de/fau/cs/mad/yasme/android/ui/fragments/ChatSettingsRemove.java
Merge remote-tracking branch 'origin/master'