Easter egg 2048
Merge branch 'master' of https://github.com/lemfi/PJMaintenant.git

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
Fix texte