post task
Merge branch 'master' of https://github.com/elxnis/MyCityAndroid

Conflicts:
	res/layout/activity_create_message.xml