Fix compilation
Fix crash
Merge branch 'feature/vfspp' into feature/chromiumInput

Conflicts:
	code/osapi/osapi.cpp
Update submodule