updated CHANGELOG
Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1
reduce memory usage for small collections
a few small fixes for logging
updated error codes
renamed "shell" to "emergency console"
delete is remove
fixed jslint errors
more exports
fixed duplicate
added jslint target
fixed typo
fixed names
Merge remote-tracking branch 'origin/issue317' into 1.1

Conflicts:
	js/common/bootstrap/modules.js
issue 317
Merge branch 'issue317' of github.com:triAGENS/ArangoDB into 1.1

Conflicts:
	CHANGELOG
moved to actions.errors
Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/actions/system/api-collection.js