//Upload avatar + reconnect
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/LayerFriend.cpp