Sexe
Merge branch 'master' of https://github.com/THPInc/PhotoNum

Conflicts:
	PhotoNum/build/classes/fr/THPinc/photoNum/dbControllers/DBManager.class
	PhotoNum/build/classes/fr/THPinc/photoNum/dbControllers/TestDB.class
	PhotoNum/src/fr/THPinc/photoNum/dbControllers/DBManager.java
Merge branch 'master' of https://github.com/THPInc/PhotoNum