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

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameActivity.java
Fix merge issue
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo
Test
Merge branch 'master-elliot-fail' of https://github.com/julienCsj/ProjetAndroid into master-leo

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameActivity.java
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameView.java
Fix commit merge
Score game activity OK