Indentation
Update Spring to 1.1.1
Some specs for PagesController#show
Custom view template resolver for websites
Remove underscore
Update to Rails 4.1.0.rc1
Merge branch 'develop'

* develop:
  Update to Rails 4.1.0.rc1
  Remove underscore
  Custom view template resolver for websites
  Some specs for PagesController#show
  Update Spring to 1.1.1
  Indentation