Define
Merge branch 'master' into define

Conflicts:
	gramatika.bnf
Define fix
Merge branch 'define'