RuleType.Choice now outputs expected tokens on error.
Merge commit 'abe33f4c4d94eed4e4218ed8da74485290bfbaa6'

Conflicts:
	TinyPG/CodeGenerators/CSharp/ParserGenerator.cs
Added to change list.

(cherry picked from commit 713271e5ab48ec9147793da79ea0e2dee8b94d10)

Conflicts:
	README.md