...
Merge branch 'master' of https://github.com/workspacerg/JavaThomas

Conflicts:
	esgiRouter/WEB-INF/classes/org/esgi/orm/Application.class
	esgiRouter/WEB-INF/classes/org/esgi/orm/BDD.class
	esgiRouter/WEB-INF/classes/org/esgi/orm/ORM.class
	esgiRouter/WEB-INF/classes/org/esgi/orm/my/model/Film.class
	esgiRouter/WEB-INF/src/org/esgi/orm/Application.java
	esgiRouter/WEB-INF/src/org/esgi/orm/ORM.java