Merge branch 'Zoom'
Ajout de quelques fonctionnalitée pour implementer des options
Merge branch 'Zoom'
set button visible
Merge branch 'Zoom'
Merge branch 'master' of https://github.com/djguiaume/mCamera

Conflicts:
	res/layout/fragment_main.xml
	src/com/epitech/mcamera/MainActivity.java
	src/com/epitech/mcamera/MySurfaceView.java