stage 3
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts:
	ProjectSettings/ProjectSettings.asset