Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor
Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor
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
removed name for semaphore, event, mutex and spin mutex.
Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor
removed default parameters from mutex and spin mutex.
Merge pull request #32 from nem0/multithread_refactor

Multithread refactor
Merge pull request #33 from nem0/fs_refactor

Fs refactor
gui atlas
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui
mutexes create fix.
Merge pull request #34 from nem0/multithread_refactor

mutexes create fix.
Merge branch 'master' of https://github.com/nem0/LuxEngine into gui
physics.dll can be compiled in release mode
Merge pull request #38 from nem0/fs_refactor

fixed: memory file capacity
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