Sublime-Text settings
Merge branch 'master' of https://github.com/kur3k/sublime-text-settings

Conflicts:
	Default (Linux).sublime-keymap
	Preferences.sublime-settings