removed maven-war-plugin
Merge branch 'dev' into servlet2