alfsdkklsdjFsxncMerge branch 'master' of https://github.com/DevenSmith/TrickyNinja-1 into DevenSmith-master

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'DevenSmith-master'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset