work around editor
Merge branch 'master' of https://github.com/gregorytkach/flow

Conflicts:
	src/GameInfo.lua
Merge branch 'master' of https://github.com/gregorytkach/flow

Conflicts:
	src/models/editor/ManagerEditor.lua
Merge branch 'master' of https://github.com/gregorytkach/flow
fix view grid editor