windows 2012 fixes
merge conflicts
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
enum name change due to conflict on windows
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel