wrong version number - update to 3.1.0-incubating-SNAPSHOT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Merge branch 'master' into MARMOTTA-450