#1198 - added caching for user defined queries
#1065 - added option to add a key for a new document or edge
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel