update

update
s

s
y

y
Merge remote-tracking branch 'origin/Magnus'

Conflicts:
	Moonminer/Moonminer/resources/Thumbs.db
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	Moonminer/Debug/Moonminer.exe
	Moonminer/Debug/Moonminer.ilk
	Moonminer/Debug/Moonminer.pdb
	Moonminer/Moonminer.sdf
	Moonminer/Moonminer.v11.suo
	Moonminer/Moonminer/Debug/CL.read.1.tlog
	Moonminer/Moonminer/Debug/CL.write.1.tlog
	Moonminer/Moonminer/Debug/Moonminer.log
	Moonminer/Moonminer/Debug/Texturemanager.obj
	Moonminer/Moonminer/Debug/cl.command.1.tlog
	Moonminer/Moonminer/Debug/link.command.1.tlog
	Moonminer/Moonminer/Debug/link.read.1.tlog
	Moonminer/Moonminer/Debug/link.write.1.tlog
	Moonminer/Moonminer/Debug/vc110.idb
	Moonminer/Moonminer/Debug/vc110.pdb