moved methods to ArangoCollection
fixed jslint errors
Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	Makefile.in
	js/server/server.js