jslint fix
coffee script fix
Merge branch '2.0' of github.com:triAGENS/ArangoDB into 2.0