Don't try to turn on prop mods while in warp
Merge branch 'upstream/master'

Conflicts:
	EveComFramework/bin/Release/EveComFramework.dll