Merge remote-tracking branch 'origin/HotFury'

Conflicts:
	Assets/Scripts/TestRepoScript.cs
Merge branch 'master' of https://github.com/KonanMarjan/try