settings conflict
Merge branch 'master' of https://github.com/djguiaume/mCamera

Conflicts:
	src/com/epitech/mcamera/MainActivity.java