changes before merge with security framework introduction
Merge branch 'master' of
github.com:DataAnalyticsinStudentHands/RESTFUL-WS

Conflicts:
	pom.xml
	src/main/java/honors/uh/edu/infrastructure/UserModule.java
	src/main/java/honors/uh/edu/repositories/contract/Repository.java
	src/main/java/honors/uh/edu/repositories/impl/mock/DummyMockRepositoryImpl.java
	src/main/java/honors/uh/edu/rest/LoginService.java
Database communication is now used for the rest service as well as
spring security.  Be sure webSecurityConfig.xml and dao are pointing to
correct DB, the included DB name has changed. The @get to /users is
currently inactive but similar results can be gotten by /users/{id} but
expects an id column in the users table.