Merge branch 'release/first_models_and_ui'
fixed navbar javascript was out of place needed to adjust all templates
Merge branch 'hotfix/fix_navbar_collapse' into develop

Conflicts:
	emrapp/templates/main/base.html