KISS Synchronous chat implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/values-nl/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/values-nl/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Fixed multithreading bug