Bump version
Merge branch 'master' into ospalh-special

Conflicts:
	Quick note and deck buttons.py
Remove mentions of width.
Bump version.
Merge branch 'master' into ospalh-special

Conflicts:
	Quick note and deck buttons.py