new style class
Merge
Merge branch 'master' of https://github.com/teoric/grundgesetz-dev

Conflicts:
	utilities/tok.py