reorganisation of modules
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
more cleanup
fixed comments
more cleanup
more cleanup
fixed tests
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/client/client.js
	js/common/bootstrap/module-internal.js
	js/common/modules/org/arangodb/simple-query-common.js
	js/server/ahuacatl.js