VMC-22(fixed problem of duplicate node listed in server list of admin tab)
Merge branch 'master' of https://github.com/deerwalk/voltdb

Conflicts:
	src/frontend/org/voltdb/dbmonitor/js/voltdb.render.js
	src/frontend/org/voltdb/dbmonitor/js/voltdb.ui.js