.
Merge branch 'master' of github.com:apetrovskiy/STUPS

Conflicts:
	STUPS.userprefs
refactoring