merge
Merge branch 'master' of https://github.com/qimmer/indiejam2014

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/7e/7e2544c52d9594aa0bbda094955d7324
	indiejam2014-csharp.sln
	indiejam2014.sln