merge
merge
Merge branch 'master' of https://github.com/adrien-louis-r/green-rent

Conflicts:
	setup/glassfish-resources.xml
	src/conf/persistence.xml
fix gitignore and add table auto-creation