before merge with security ACL stuff
before merge with security ACL stuff
merge with RESTFUL-WS-master acl for VolunteerApp
Lots of changes,and additions, will write a complete commit message when
its working.  In summary though I attempted to add a group object and
its permissions
Primary Changes:
-Implemented the "Group" data type and its acl permissions handling.
-Created the aclController bean to be used by service level
implementations
-Updated sql structure

Please look at the wiki for detailed information on how to use the API
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
Added an Overwrite sql query in the mysql directory.  Can use to
completely replace the tables used by this version.
Merge branch 'VolunteerApp' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS into VolunteerApp
Updated CORS Filter
started merge with latest VolunteerApp branch
Merged branch 'VolunteerApp' of github.com:DataAnalyticsinStudentHands/RESTFUL-WS with branch master after adding of groups as an example for new objects