Merge branch 'Feature_Search' into development

Conflicts:
	app/Resources/views/base.html.twig
	web/assets/css/bootstrap.css
	web/assets/css/bootstrap.css.scss
Cleaning up some css and adding search to sidebar
Merge branch 'Task_Cleanup' into aws_production