Update gruntfile.js
Update default.html

Fixed. Spent days and eventually 40$ fixing this. Under certain conditions, the header wouldn't load.
Fixed issue #320 #314 - @Drew - this is the beginning of the cleanup...
Merge pull request #307 from leejessy/patch-1

Update gruntfile.js
Merge branch 'patch-1' of https://github.com/Squ34k3rZ/mean into Squ34k3rZ-patch-1
Merge branch 'master' of http://github.com/linnovate/mean
Merge pull request #1 from kwakayama/master

Fix package.js and jshint errors
add editorconfig file
merge upstream branch
Assign user to feathers
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Assign user to feathers
  add editorconfig file
  Fixed issue #320 #314 - @Drew - this is the beginning of the cleanup...
  Update default.html
  Update gruntfile.js

Conflicts:
	app/services/articles.js
	config/express.js