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

Conflicts:
	Library/CurrentLayout.dwlt
	indiejam2014-csharp.sln
	indiejam2014.sln