Server zur 80% implementiert
Merge branch 'master' of https://github.com/dima888/RNchat

Conflicts:
	nbproject/private/private.properties