Fix for Enums, fix to account settings

Merge remote-tracking branch 'remotes/origin/develop' into 127-join-request

Conflicts:
	root/api/src/main/java/org/patientview/api/controller/GroupController.java
	root/api/src/main/java/org/patientview/api/service/GroupService.java
	root/api/src/main/java/org/patientview/api/service/impl/GroupServiceImpl.java
	root/webapp/app/index.html
	root/webapp/app/scripts/services/groupservice.js