regarde:less uses parallel:less
Update grunt-express-server
Update grunt-angular-templates
Merge branch 'master' into feature/static

Conflicts:
	package.json
LiveReload all teh things!
Fix npm start
Base tag doesn't open
Remove uneccessary font