updating framework
Merge branch 'master' of https://github.com/bitgandtter/sunscious-frontend

Conflicts:
	app/SymfonyRequirements.php
	composer.lock
	src/DashboardBundle/Resources/views/Dashboard/index.html.twig