Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0
Merge branch '2.0' of https://github.com/triAGENS/ArangoDB into 2.0
fixed "cannot convert value to JSON" error
slightly fixed CHANGELOG
fixed segfault during test on Windows
fix coffee script parse error error
adjusted documentation
updated manual
add 2.0 to travisCI
fixed createNonce call
prevent usage of _useDatabase() in web interface
updated manual
fixed jslint warning