some fixes for issue #642
fixed memleak
issue #621: Standard Config needs to be fixed
fixed freeing of key
issue #620
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	Documentation/Manual/Upgrading14.md
merging failed... angst