local benedikt commit
Merge branch 'AndroidClient' into Merged

Conflicts:
	SmartChat/bin/Client/Client.class
	SmartChat/src/Client/Client.java
android client beta (works!); 04-03-2014