marco! :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	settings.ini