should work out of the box
Merge branch 'master' of github.com:Troyhy/ngbp

Conflicts:
	Gruntfile.js
	src/app/about/about.coffee
	src/index.html
aadded livereload and escaped for django