Merge branch 'master' of https://github.com/BlueBrain/flatbuffers

Conflicts:
	CMakeLists.txt
	src/flatc.cpp
	tests/test.cpp