Merge pull request #1154 from yojimbo87/devel

Improve collection API docs
issue #1131: added KEEP for `COLLECT...INTO`
fixed memleak in shaper
prevent double-free of variable bounds
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel