index on master: 272a4f4 New templates and shortcuts.
WIP on master: 272a4f4 New templates and shortcuts.
Merge commit 'stash'

Conflicts:
	basket/shortcuts.py