mac update
Merge branch 'master' of https://github.com/tiansijie/penn-play2014

Conflicts:
	game jam/Assembly-CSharp-firstpass.csproj
	game jam/Assembly-CSharp-vs.csproj
	game jam/Assembly-CSharp.csproj
	game jam/Assembly-UnityScript-firstpass-vs.unityproj
	game jam/Assembly-UnityScript-firstpass.unityproj
	game jam/game jam-csharp.sln
	game jam/game jam.sln