parser fixes
Merge branch 'master' of github.com:gyzerok/UPG

Conflicts:
	UPG/QParser.cpp