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

Conflicts:
	res/layout/activity_main_activity_new.xml