Add CalculationPlan, create arangod/Aql/Types.h
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2