Edit functionality Working with image as background
Merge branch 'master' of https://github.com/paramsethi/Doodle

Conflicts:
	app/src/main/java/com/ms/doodle/app/EditImageActivity.java