New Changes
Merge branch 'master' of https://github.com/prabath321/NewAndroidProject

Conflicts:
	AndroidManifest.xml
Confilt changes