Added a collect by address for dbServers and coordinators to show them based on their machine
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js