update
Merge branch 'benzoback' of https://github.com/WinterBall/ChatApplication into PavBranch

Conflicts:
	app/src/main/res/layout/activity_settings.xml
Merge remote-tracking branch 'origin/PavBranch' into PavBranch

Conflicts:
	app/src/main/res/layout/activity_settings.xml