Working on adding calendar
Merge branch 'master' of github.com:Panoptisis/team-up

Conflicts:
	app/Resources/views/base.html.twig
Merge branch 'master' of github.com:Panoptisis/team-up
Moved JS files around