Navigation bar as a html template
Merge branch 'Recommendation'

* Recommendation:
  Navigation bar as a html template

Conflicts:
	mysite/mysite/urls.py
	mysite/userdb
Navigation bars changed!