changed mail address
Merge branch 'master' of github.com:tammok/CVST

Conflicts:
	DESCRIPTION