Fixing the api. Removing non necessary fields from user model. Making rest endpoints idempotent
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/runConfigurations/Development__zenforce.xml
	.idea/workspace.xml
	.idea/zenforce.iml