-commit
Merge branch 'master' of github.com:vinStar/mybase6

Conflicts:
	nyfedit.ini
	samples/Default.nyf
	samples/Default.ssgindex