commit commit
Merge branch 'develop' of https://github.com/upendratarnoju/hello1 into ui

Conflicts:
	hello1/res/layout/activity_main.xml