fix DB_PWD constant
fixes
Merge branch 'master' of https://github.com/Mahi-Mahi/QuelBleuEtesVous

Conflicts:
	app/styles/_flexslider.scss