first gui commit
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui

Conflicts:
	projects/platform/platform.vcxproj
	projects/platform/platform.vcxproj.filters
	src/core/ifilesystem.h
	src/core/json_serializer.cpp
	src/engine/engine.cpp
	src/platform/native_file_system.h
	src/platform/pc/native_file_system.cpp
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui
gui atlas
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui
functor replaced with delegate; unused editor project removed
new native editor using gui system partially implemented
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui

Conflicts:
	src/core/functor.h
gui controls
*.orig files removed; *.orig added to .gitignore
Merge pull request #39 from nem0/gui

Gui
fixed possible stack corruption in JSON serialization - closes #24
MemoryStream -> Blob
mend
Merge pull request #40 from nem0/issues

MemoryStream -> Blob
fixed possible stack corruption in JSON serialization
release build fix
removed unused files
Merge remote-tracking branch 'remotes/origin/master' into net_refactor

Conflicts:
	projects/core/core.vcxproj
	projects/core/core.vcxproj.filters
	src/editor/editor_server.cpp
	src/platform/pc/socket.cpp
- merged master
- fixed build