update

update
Merge remote-tracking branch 'origin/Magnus'

Conflicts:
	Moonminer/Moonminer/resources/Thumbs.db