test
test
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
ref. MARMOTTA-349
-added context.xml for setup BeanManager as resource in Tomcat 7
-modified plugin configuration for setting context path
error init templating service, deleted unnecessary code
idea paths ignored