dont know what i did
Merge branch 'master' of https://github.com/oehm/AndroidChat

Conflicts:
	res/layout/activity_host_configure.xml
	res/values/strings.xml