Add 'whoops' page.
Merge branch 'master' of https://github.com/pauljamesrussell/insureme
Merge branch 'master' of https://github.com/pauljamesrussell/insureme
Fixed failed merge.
Merge branch 'master' of https://github.com/pauljamesrussell/insureme

Conflicts:
	app/assets/images/policy_icons/buildingicon.png