unittests-shell-server-ahuacatl is deprecated
activated optimizer rule remove-sort-rand

fixed tests, updated documentation
ES6
documentation for `mergeObjects` option
updated documentation
updated documentation
removed sort expressions that are constants
added -march=armv6 for raspberry pi
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
unittests-shell-server-ahuacatl is deprecated
Update .travis.yml
added test case
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
issue #1197: updated compile instruction regarding cleaning
ES6
Squashed commit of the following: organise locking in distributed AQL

Locking is now done in an extra round after the query is fully
instanciated in the cluster. All participating shards are locked
in alphabetical order of their shard ID (local collection name).
For this to work there is a new action in the RestAqlHandler plus a
mechanism to prevent the usual locking from happening: Each thread has a
thread local static class variable of
  triagens::arango::Transaction::_makeNolockHeaders
which is of type std::unordered_set<std::string>*.
Whenever this is not equal to nullptr and a local collection name is
stored in there, no locking or unlocking takes place. This information
is forwarded by the X-Arango-Nolock HTTP header, whenever an HTTP
request is sent via ClusterComm to a shard.
Fix two compiler warnings.
updated Upgrading notes
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
bumped version number