Bug Fixing Step 1
Merge branch 'develop' of https://github.com/suneelprakashriktam/PicaPoco into develop

Conflicts:
	Project/AndroidManifest.xml