start chat
user shared pref
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android_app/Fix4Me2Project/Fix4Me2/src/main/res/layout/l_chat.xml