fixed "cannot convert value to JSON" error
slightly fixed CHANGELOG
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel