Dégage bouton
as
Ajout du getCamera
Merge branch 'master' of https://github.com/djguiaume/mCamera

Conflicts:
	res/layout/fragment_main.xml