Signed-off-by: Hp <Hp@Shadyroxx>


Signed-off-by: Hp <Hp@Shadyroxx>
Merge branch 'master' of https://github.com/Team-SOGO/careu.git

Conflicts:
	careu/.classpath
	careu/.settings/org.eclipse.wst.common.component
	careu/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	careu/.settings/org.eclipse.wst.common.project.facet.core.xml
	careu/web/WEB-INF/web.xml