dfd

gfdfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	MobileChatApp/MobileChatApp.v12.suo
	MobileChatApp/MobileChatApp/views/onlineContactsView.html
	MobileChatApp/MobileChatApp/views/userProfileView.html