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

Conflicts:
	Assets/Space_Invaders/_source/Textures/Thumbs.db.meta
	Assets/ToonFlowerPlant/Textures/Thumbs.db.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/16/16802addcbea49843948e1b5427a20c3
	indiejam2014-csharp.sln
	indiejam2014.sln