Merge conflict repair
Merge origin/master

Conflicts:
	ConseillersNetbeans/application/component/GlobalFeaturesWidgetComponent.class.php
	ConseillersNetbeans/assets/css/style.css
	ConseillersNetbeans/assets/css/widgets.css