My local changes
Merge branch 'develop' of https://github.com/aghadiry/AndroidHelloWorld into develop

Conflicts:
	res/layout/activity_activity1.xml