commit modif fix android
Merge branch 'master' of https://github.com/hrougier/workspace

Conflicts:
	sweetsnake/sweetsnake-server/src/main/java/com/esir/sr/sweetsnake/aspect/SynchroAspect.java