Merge branch 'master' of https://github.com/google/flatbuffers
Fix merge issues
Merge branch 'master' of https://github.com/eile/flatbuffers

Conflicts:
	CMakeLists.txt