added extend and edit functions for edgeDefinitions of existing graphs
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Some fixes for folding
added documentation to ahuacatl general graph functions and refactored common_Neighbors and  common_properties
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
jslint
jslint
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
jslint
jslinted
removed outdated upgrade methods
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js