Removed settings
Merge branch 'master' of github.com:kiliweb/civisphere_vitrine

Conflicts:
	sites/default/settings.php