clean up after merge?
Merge branch 'TrickyNinja'

Conflicts:

Unity/Assets/Shared/Art/FX/TimeIndependentSwipes/SwipeFX/mesh/Trail_FX.p
refab
	Unity/Assets/Shared/Scripts/projects/InputControlFreak/CF_Prefabs.meta
	Unity/Layouts/LastLayout.dwlt
Unity layout update?
Merge branch 'master' into TrickyNinja