Merge branch 'master' of https://github.com/ducksmanager/squt.git

Conflicts:
	parser/myparse_to_squt.pl
Merge branch 'master' of https://github.com/ducksmanager/squt