fix carddeck_gen
Merge branch 'dev' into dev_web

Conflicts:
	maclient_smart.py