added User entity, UserType (form), newAction controller
Added User entity, UserType (form).
Added newAction() controller
Merge remote-tracking branch 'origin/webservice' into webservice

Conflicts:
	.idea/.name
	.idea/frameworkRootSettings.xml
	.idea/modules.xml
	.idea/workspace.xml