added keep-md
release version 2.2.0-alpha3

Conflicts:
	CHANGELOG
	Makefile.in
	VERSION
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/aqlfunction.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/import.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/query.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/transaction.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
Softened warning about app.delete in docs.
Documented Foxx exports, injection.
renamed ReadOnly to NoCreate
fixed tests
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Added other system apps to jslint task.
Some changes in the code documentation
jslint
 jslint
Some changes in the code documentation
Some changes in the documentation code
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
finished documentation of complexity
new templates for graph management
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Some changes in the documentation code
fixed graph managment
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js