sync
Merge branch 'master' of https://github.com/JayArmstrongGames/Camp-Fire-Journeys

Conflicts:
	Camp-Fire-Journeys-csharp.sln
	Camp-Fire-Journeys.sln
	Camp-Fire-Journeys.userprefs
	Library/CurrentLayout.dwlt
	Library/guidmapper
	Temp/__EditModeScene