Merge branch 'Emplace' into development
# Conflicts:
# src/CreateFSM.bat
# src/CreateMessageRouter.bat
# src/flat_map.h
# src/fsm.h
# src/fsm_generator.h
# src/message_router.h
# src/message_router_generator.h
# src/queue.h
# src/vector.h
# test/codeblocks/ETL.depend
# test/codeblocks/ETL.layout
# test/data.h
# test/test_fsm.cpp
# test/test_message_router.cpp
# test/vs2017/etl.vcxproj
# test/vs2017/etl.vcxproj.filters
# test/vs2017/random.csv
