Life management system
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameView.java