kj
kjMerge branch 'master' of http://github.com/THPInc/PhotoNum

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