moved the arangod.conf file
Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2
Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel