test
Merge branch 'master' of https://github.com/DevnectFX/DSW

Conflicts:
	DSW.userprefs