Bugfixes
Bugfixes
Merge branch 'master' of https://github.com/syntonym/opencard-illu

Conflicts:
	Frontend.py