Quote string in server tests for Windows backslashes.
fixed "cannot convert value to JSON" error
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
slightly fixed CHANGELOG
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed segfault during test on Windows
added detail view to showClusterView and fixed modal bug
fix coffee script parse error error
adjusted documentation
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
updated manual
add 2.0 to travisCI
fixed images
bug  fix: compiling error
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
fixed navibar highlighting
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
added header
Fixed JSLint whining
fixed createNonce call