changed folder structure and fixed pom
fixed some issues with Tomcat Eclipse deployment (Web project context
path is now RESTFUL-WS)
changes to get ready for database usage
removed ResponseCorsFilter (is now set in web.xml)
finished DB integration with UserRestService, cleaned some stuff that was used for testing only (deleted JSONService, HelloWorldService, DBConnection, SecurityManager
Merge remote-tracking branch 'origin/master' into secure

Conflicts:
	.classpath
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml
	src/main/java/honors/uh/edu/dao/DbConnection.java
	src/main/java/honors/uh/edu/infrastructure/DashApplicationSetup.java
	src/main/java/honors/uh/edu/infrastructure/SecurityManager.java
	src/main/java/honors/uh/edu/pojo/User.java
	src/main/java/honors/uh/edu/repositories/impl/mock/GenericMockRepository.java
	src/main/java/honors/uh/edu/repositories/impl/mock/UserMockRepositoryImpl.java
	src/main/java/honors/uh/edu/rest/HelloWorldService.java
	src/main/java/honors/uh/edu/rest/ImageService.java
	src/main/java/honors/uh/edu/rest/JSONService.java
	src/main/java/honors/uh/edu/rest/UserRestService.java
	src/main/java/honors/uh/edu/service/contract/UserService.java
	src/main/java/honors/uh/edu/service/impl/DummyServiceImpl.java
	src/main/java/honors/uh/edu/service/impl/UserServiceImpl.java
	src/main/webapp/WEB-INF/web.xml

Had to discard changes to web.xml because sourcetree is stupid.  Retained the web.xml from security branch