orphan may only be added when not used in edge def
Started adding links for the graph http module in the gitbook
Started adding examples to the http graph module
Added further links for the graph module in the gitbook
Added a general readme file for the http documentation of the general graph module
Solved uniqueness conflicts for generated examples
Moved newest version of general graph into web interface
added configuration to manifest, install and mount

Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
refactored orphan treatment for guacamole belongings
fixed merge conflicts
jslint
made make
Fixed appContext reference in manifest cfg.
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
jslint
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
added recovery tests (not functional yet)
issue #906: changed returned field in primary index description from `_id` to `_key`.
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh