Merge branch 'managerdb' into deploy

Conflicts:
	project/AppServer/pom.xml
	project/AppServer/src/main/webapp/WEB-INF/web.xml
Merge branch 'deploy' of https://github.com/gerardcl/SDN-OAM-project into deploy

Conflicts:
	project/AppServer/pom.xml
	project/AppServer/src/main/webapp/WEB-INF/web.xml
Merge branch 'deploy' of https://github.com/gerardcl/SDN-OAM-project into deploy
issue merge solved