Change for py2exe
Change for py2exe
Merge remote-tracking branch 'origin/obusExp' into obusExp

Conflicts:
	gui.py
	recogn/rec.py
Changes for py2exe
Changes for py2exe