before merge with security ACL stuff
before merge with security ACL stuff
merge with RESTFUL-WS-master acl for VolunteerApp
Merge branch 'VolunteerApp' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS into VolunteerApp

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
	App/www/index.html
	App/www/js/app.js
	App/www/js/controllers.js
	App/www/js/services.js
	App/www/partials/user-creation.html
	App/www/partials/user-detail.html
	src/main/java/dash/DashApplicationSetup.java
	src/main/java/dash/security/GenericAclContoller.java
	src/main/java/dash/security/GenericAclController.java
	src/main/java/dash/security/IAclObject.java
	src/main/java/dash/service/UserServiceDbAccessImpl.java
	src/main/java/honors/uh/edu/security/GenericAclContoller.java
	src/main/resources/spring/applicationContext.xml
	src/main/resources/spring/webSecurityConfig.xml
Merge branch 'VolunteerApp' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS into VolunteerApp

Conflicts:
	src/main/java/dash/dao/GroupEntity.java
some eclipse settings
Merge branch 'VolunteerApp' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS into VolunteerApp