Better label for relation-fieldsets
Clarify label for student associations
add dependencies to package.json
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