WYSIWYG editor setup
Merge branch 'master' of github.com:bionic-university/sparrow

Conflicts:
	app/Resources/views/base.html.twig
	app/Resources/views/front.html.twig