merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
pages_controller_spec all working again
Merge pull request #19 from tihuan/fix/pages_controller_spec

Fix/pages controller spec