using paths correct paths, starting as service
release version 1.4.11
deleted spacer
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	CMakeLists.txt
Bug Fix: compiler error
       : searching strategy for installation directory upgraded
acoppling NSIS.InstallOptions.ini.in for arango installation
a few changes at the navigationbar
Disable test with a bad timeout on cluster.
Add the cluster test case.
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Bug Fix: RegKeys and ShortCuts are allways after desinstall deleted
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
Take out 2 tests involving transactions of cluster tests.
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
changed default
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding
fixed checkbox problem with reading value
only arango icons are exported in to installation directory
SimpleService Plugin was copied in to project directory in order to allow
an automatic build of arango under windows
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding