Chat activity/ activity_main.xml rename
manifest conflict resolved
Merge branch 'master' of https://github.com/epikur90/sw14_xp_05

Conflicts:
	PinKee/AndroidManifest.xml