Nav bar namn, init currentResource, bootstrap m.m
Merge branch 'master' of https://github.com/sploosch/tddd27

Conflicts:
	mysite/mysite/static/corman/js/controllers.js
	mysite/mysite/static/corman/js/corman.js