Merge branch 'staging' of github.com:openplans/planbox into dashboard

Conflicts:
	src/planbox_ui/static/styles/main.css