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
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