issue #970: Incorrect transaction example
issue #972: Compilation Issue
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
moved variable into own file
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2