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

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj