Wherbarium 2014-03-04 17:07
Wherbarium 2014-03-04 17:43
Wherbarium 2014-03-07 16:48
Werbarium 2014-03-07 16:56
toto
Merge http://github.com/mybofy/Wherbarium

Conflicts:
	Wherbarium.xcodeproj/project.pbxproj
	Wherbarium.xcodeproj/project.xcworkspace/xcuserdata/rn.xcuserdatad/UserInterfaceState.xcuserstate
	Wherbarium/AppDelegate.h
	Wherbarium/AppDelegate.m
	Wherbarium/Base.lproj/MainMenu.xib
	Wherbarium/ListeFichiersViewCtrl.h
	Wherbarium/ListeFichiersViewCtrl.m
	Wherbarium/ListeFichiersViewCtrl.xib
	Wherbarium/PGSQLKit.framework/Versions/A/Headers/PGSQLConnection.h
	Wherbarium/PGSQLKit.framework/Versions/A/PGSQLKit
	Wherbarium/PGSQLKit.framework/Versions/A/Resources/Info.plist
	Wherbarium/PhotoOutlineViewCtrl.h
	Wherbarium/PhotoOutlineViewCtrl.m
	Wherbarium/Plante.h
	Wherbarium/Plante.m
	Wherbarium/SIPgSql.h
	Wherbarium/SIPgSql.m
	Wherbarium/Utility.h
	Wherbarium/Utility.m
	Wherbarium/Wherbarium-Info.plist
	Wherbarium/Wherbarium.entitlements
	Wherbarium/en.lproj/Credits.rtf