Update 2014-06-11
Merge branch 'master' of http://github.com/opennx/nx.server