begin mergin from ftp
Merge branch 'master' of https://github.com/bitgandtter/sunscious-frontend

Conflicts:
	app/config/config.yml
	composer.lock
	src/DashboardBundle/Controller/DashboardController.php
	src/DashboardBundle/Resources/views/Dashboard/index.html.twig
	web/css/datepicker.css
	web/css/jquery.fancybox.css
	web/css/jquery.jscrollpane.css
	web/css/main.css
	web/css/main_old.css
	web/js/bootstrap-datepicker.js
	web/js/datepicker.js
	web/js/functions.js
	web/js/infobubble.js
	web/js/jquery.blockUI.js
	web/js/main.js
	web/js/map.js
	web/js/news.js