alksdj;
sakldjf;Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
St3/6