plein de modifs : transition load -> choice
Merge branch 'master' of https://github.com/Warrows/projet-intensif-image-2015

Conflicts:
	ChoiceScreen.js
Merge branch 'master' of https://github.com/obodrel/projet-intensif-image-2015
Commentaire code non ecrit levelscreen
entities v3