cleanup of flags
windows does not like cast from double to enum
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.1

Conflicts:
	3rdParty/Makefile.libbson