Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0
fixed navibar highlighting
added header
fixed pagination on logs
fixed pagination - small refactoring
missing closing div-tag inserted
reverted to older version...
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
	js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
Karma frontend integration tests: Relinked all ajax-requests to a different arangod running on port 7777
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel