update
Merge branch 'master' of github.com:mupat/dev

Conflicts:
	.gitignore
	sublime_user/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	sublime_user/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	sublime_user/Package Control.sublime-settings
	sublime_user/Preferences.sublime-settings