Footer and navbar
Merge branch 'master' of https://github.com/whatsup-project/whatsup

Conflicts:
	app/Resources/views/navbar.html.twig
CSS + Script
Merge branch 'master' of https://github.com/whatsup-project/whatsup

Conflicts:
	app/Resources/views/navbar.html.twig
Footer, Nav, UserBundle
Merge branch 'master' of https://github.com/whatsup-project/whatsup