recompile main.css for merge conflict
Merge branch 'staging' of github.com:openplans/planbox into staging