Merge pull request #698 from loomio/features/divide_frontpage

Rob's branch: Features/divide frontpage
fix failing spec

fix failing spec
Merge pull request #687 from loomio/bugfix/carrots_escaping

fix improper carrot escaping, fixes #674
fix crash in wellington online collaboration page
Merge pull request #700 from loomio/bug/fix-woc-controller-crashes

fix crash in wellington online collaboration page
Merge pull request #673 from loomio/feature/fix-proposal-outcome-field-layout

fix proposal outcome field layout, fixes #669
Fix hide announcement bug
Replace Thin with Unicorn
Merge pull request #705 from loomio/bug/hide-announcement-problem

Bug/hide announcement problem
Merge pull request #704 from loomio/perf/unicorn

Replace Thin with Unicorn
Add rack-timeout for better error reporting

This will give us better error reporting when stuff times out.
It will also allow us to have finer control over how long
we allow requests to go for. Perhaps we only want requests to
last for 10 seconds before cancelling... rack-timeout lets us
control this.
Merge pull request #707 from loomio/perf/force-timeout

Add rack-timeout for better error reporting
Add eager-loading in several places to improve performance
Merge pull request #702 from loomio/perf/eager-load-willy-nilly

Perf/eager load willy nilly
add group admin email to view in admin panel
Typographical improvements to front page
Upgrade activeadmin
Downgrade activeadmin to 0.5
Stop empty comments from raising error
Merge pull request #710 from mhjb/feature/typography

Typographical improvements to front page