MARMOTTA-431: changed package name to just 'marmotta' (replaces the other)
MARMOTTA-431: fixed version generation, both for snapshots and releases
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop