better error message if keyfile cannot be found
added derived file
some layout changes
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
somone put the letter 'F' in there O.o
img size fixed
removed unnessary files
fixed dropdown item selection and dropdown hide event of user dropdown
added periodic tasks and statistics historian
changed default avatar image size
ignore cache
do not allow reset
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding

Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
added no request