EDIT

excluding database drivers from cdmlib-remote-webapp.war

removing c3p0 jar from cdmlib-remote-webapp.war

switching remoting on in eclipse launcher

solving probelms with running the jetty-maven plugin:
- plugin downgrade to jdk 1.7 compatible version
- downgrading xstream to jdk 1.7 compatible version
- setting user.home to target folder

Adapt log4j.properties to hibernate deprecated logging problem

lowering jetty-maven-plugin version to 9.1.3.v20140225 for compatibillity with java 1.7

resolving conflicts after merge of ticket_4716 into develop

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.13.0-SNAPSHOT development