.
Merge remote-tracking branch 'origin/master'

Conflicts:
	autoMessage/res/layout/activity_profile.xml