Rework archi
Merge branch 'master' into zxing_customization

Conflicts:
	Android/app/src/main/java/fr/tvbarthel/apps/adaptilo/engine/AdaptiloEngine.java