Correction edition de la boutique
Merge origin/master

Conflicts:
	src/java/abey/AbstractController.java
Merge branch 'master' of https://github.com/IM2FAGS/psychic-batman
merge