Trying to fix the asset pipeline stuff for heroku
Fix merge conflict
Merge branch 'dev-clive' of github.com:ministryofjustice/civil-claims into dev-clive
Merge pull request #45 from ministryofjustice/dev-clive

Dev clive