fixed CXX and LINK
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.1
release version 2.1.0-beta1