corrected design error
corrected design error
Fix the initialiser order to please the compiler.
allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files
more tests for shapes
adjusted tests
fixed vector insert at end
fixed save action of edit collection
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed multiple ids
changed expression to satisfy clang
Enable SSL on cluster.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
added id to info-button
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed collection type selection when creating collection via web interface

Conflicts:
	CHANGELOG
jslint
replace is now a protected virtual method
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
removed hash array statistics