Unified badges and buttons on tiles
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
fixed userModel and notifications
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
delete user fixed
jquery update + cleanup, swagger-fix
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
removed unused libs
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss