continue REST implementation
Rest implementation
Merge branch 'master' of https://github.com/seustachi/DISP-MELM

Conflicts:
	.settings/org.eclipse.wst.common.component
	src/main/java/lu/hitec/pssu/melm/rest/LoginResource.java
	src/main/java/lu/hitec/pssu/melm/rest/MyResourceConfig.java
	src/main/webapp/WEB-INF/web.xml