update grunt; restructure js
Merge branch 'master' into grunt-updates

* master:
  add dependencies to package.json
  Clarify label for student associations
  Better label for relation-fieldsets

Conflicts:
	package.json
Merge branch 'master' into grunt-updates

* master:
  remove node modules from git

Conflicts:
	static/js/vendor/handlebars.runtime.js
remove old files
Merge pull request #67 from oddbird/grunt-updates

update grunt; restructure js