Pour pouvoir puller
Merge branch 'master' of https://github.com/Helldran/AppMobile.git

Conflicts:
	assets/www/contact.html