initial stuff
Merge remote-tracking branch 'origin/feature/user-management' into feature/user-management
Updating subscribers
Merge remote-tracking branch 'origin/feature/user-management' into feature/user-management

Conflicts:
	client/js/user-management.js
Fixing styles of Classifier form