Darkness!
Merge remote-tracking branch 'origin/marek' into marek1

Conflicts:
	.idea/workspace.xml
Torchlight!