some web interface fixes
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	html/admin/js/views/collectionInfoView.js