commit
commit
Merge branch 'master' of https://github.com/franck2/OneMoreMinute.git

Conflicts:
	.classpath
	war/WEB-INF/appengine-generated/local_db.bin
quelques modifications importantes !