added arangod-nouid
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
fixed merge error
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2