Admin update
Merge branch 'master' of https://github.com/opennx/nx.server