refactored admin templating (for MARMOTTA-228)
change configuration for new admin ui (for MARMOTTA-228)
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
added a test for the Linked Data Service; currently fails because the webservice seems broken!
Merge remote-tracking branch 'origin/develop' into develop
fixes MARMOTTA-305 - was caused because Context was not considered in ResourceUtils
implemented tests for Linked Data access (fixes MARMOTTA-28)
fixing some test errors, perparing for release
better shutdown handling for reasoner thread (fixes MARMOTTA-307)
wait longer for reasoning to finish, it usually anyways takes longer than 100ms
fix licenses and configuration of RAT plugin
reasoner force shutdown: make sure there are no more tasks in the queue
force shutdown of reasoning engine: don't wait so long