fixed incorrect disassociation from fieldgroups
Merge branch 'feature/fields_refactor' of github.com:globaleaks/GlobaLeaks into feature/fields_refactor

Conflicts:
	client/app/scripts/controllers/admin/fields.js