some changes in Grammar
Merge branch 'master' of https://github.com/swp-uebersetzerbau-ss13/javabite

Conflicts:
	common