hea
fusion projet
Merge branch 'master' of https://github.com/mrmeme/IAATO.git

Conflicts:
	bin/IAATO.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/ensiie/iaato/SiteActivity.java
FIX