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