noodling on views
Merge branch 'master' of https://github.com/ghstahl/honeybee

Conflicts:
	static/ngApps/3/routeDefs.js