Try to make a more helpful comment, help people to avoid running 'dev' without 'testacular:unit'
Merge https://github.com/OpenWebStack/structure

Conflicts:
	Gruntfile.js
Remove faulty reference to app.css
Point $resource at /r/users for user service
Static app now runs with two nav routes.
Remove bower; add angular component from distribution zip
Merge branch 'callingtree'

Conflicts:
	.gitignore
	Gruntfile.js
	app/index.html
	app/js/services/user.js