Improved version check, it now allows a user to tell the system to stop doing it
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js