Update in planning view.
Merge branch 'master' of github.com:synopslive/deck

Conflicts:
	templatetags/format_natural.py