added more test cases for arangob
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
Fixed repositioning of edge label #1017.
fixed select2 modal bug
Removed debug output
Merge branch '2.2' of https://github.com/triAGENS/ArangoDB into 2.2
potential fix for issue #1041
Merge branch '2.2' of https://github.com/triAGENS/ArangoDB into 2.2
fixed race in synchronizer
issue #972: Compilation Issue
readline vs. linenoise vs. dummyshell: next try
readline vs. linenoise vs. dummyshell: finally...
updated CHANGELOG
fixed memleak
Merge branch '2.2' of github.com:triAGENS/ArangoDB into 2.2
fixed bug with edgeCollectionRestrictions
Sort out temporary directory naming on UNIX.
Fix comments and order for new temporary paths code.