Changes to win32 window cleanup
Merge branch 'master' of https://github.com/palistov/worldbox into win32window

Conflicts:
	src/Worldbox.cpp
Merge branch 'master' of https://github.com/palistov/worldbox

Conflicts:
	src/Worldbox.cpp