neighbors
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
jslint fix
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/common/modules/org/arangodb/general-graph.js
Supporting new signature for remove function
Fix: function had used wrong signature for the test goal
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
issue #869: added small documentation for executing scripts
removing a vertex will remove all edges where this vertex is used in all graphs
strong examination of function parameters
issue #849: A few changes
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
refactored aql
cleaned up merge conflict
issue #868: Can't build the current devel on Mac OS X
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh