Add ZXing skeleton
Merge branch 'master' of https://github.com/tvbarthel/Adaptilo

Conflicts:
	Android/app/src/main/java/fr/tvbarthel/apps/adaptilo/fragments/BasicControllerFragment.java