correction du bug of the death ?
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/franciliens/servlets/RegisterServlet.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/appengine-generated/local_db.bin
	war/WEB-INF/classes/franciliens/servlets/LoginServlet.class