I7: navbar added
I7: Fixed nav bar
I7: removed Images
Merge branch 'I7_nav_bar' of github.com:Qlio/Changes

Conflicts:
	static/javascripts/packed.js