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

Conflicts:

Assets/Prefabs/PhobiesIcons.meta~6ed58a23b5d04bb0cfa73a7eb3205e22d34057e
3.meta
	Assets/Prefabs/PhobiesIcons.meta~HEAD.meta
Fix persons position
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts:

Assets/Prefabs/PhobiesIcons.meta~6ed58a23b5d04bb0cfa73a7eb3205e22d34057e
3.meta
	Assets/Prefabs/PhobiesIcons.meta~HEAD.meta
fix
Merge branch 'master' of https://github.com/nodoxi/phobia

Conflicts:
	Assets/Scripts/Helpers/GUIController.cs