Merge branch '2.2' of github.com:triAGENS/ArangoDB into 2.2
fixed inner loop variable fuckup
added style for collection status "loading"

Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
Merge branch '2.2' of https://github.com/triAGENS/ArangoDB into 2.2
fixed race in synchronizer