Add navbar SCSS partial
Removed extra markup from navbar template
Merge branch 'develop' into feature/navbar

Conflicts:
	lib/scripts.php