Small changes
Merge branch 'master' of https://github.com/paramsethi/Doodle

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_edit_image.xml