cleaning code; removing compiler warnings
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel