Fixed relaunch and shutdown and dsiplay of testPlan if a plan is existent and loading
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/routers/clusterRouter.js