Reunified ahuacatl-general-graph and aql-general-graph. Fixed JSLint in aql
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel