Merge branch 'master' into lua-env

Conflicts:
	src/ScriptResource.cpp
Switch from ce_assert to CE_ASSERT
Merge branch 'lua-env' into rendering-2