remoed BOM
Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2
Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2
Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2
generated files
added 1.2.beta2 section
added new cheat sheet
added new cheat sheet
Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2
bugfix #410: Graph REST API returns "400:Bad request" instead of "404:Not found"
Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2
libev interface
Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2
fixed path of reference card
fixed mode
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2

Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
regenerated files