Merge pull request #10 from mamio/master

added a pause State with resume button
Tile system completed
Merge branch 'master' into fidouda
Ajout d'une barre de vie et d'un niveau 2
Merge branch 'master' of git://github.com/Fidouda/Majabaja
Merge pull request #11 from benbonjour/master

Ajout d'une barre de vie et d'un niveau 2
Arranger la camera
Merge branch 'master' into fidouda
Merge pull request #12 from mamio/master

crop music main menu
Arranger level2 de Ben
Merge conflict resolved
Defilement du level1 + merge du level2 avec level1
Merge pull request #13 from Fidouda/fidouda

Much changes, such better
Merge branch 'master' of git://github.com/Fidouda/Majabaja
conflict resolved level1