Goodbye maven structure, hello Gradle!
Added .iml files to gitignore
Merge branch 'master' of https://github.com/askcs/android-simple-camera

Conflicts:
	pom.xml