Minor fix
Merge branch 'develop' of github.com:saitoha/canossa into develop

Conflicts:
	canossa/popup.py