La panique de lambiance
Merge branch 'master' of https://github.com/THPInc/PhotoNum
Panique
Conflicts:
	PhotoNum/build/classes/fr/THPinc/photoNum/dbControllers/DBManager.class
Merge branch 'master' of https://github.com/THPInc/PhotoNum

Conflicts:
	PhotoNum/build/classes/fr/THPinc/photoNum/dbControllers/DBManager.class