Merge pull request #21 from loed-idzinga/heroku-staging

Update rails to 4.1.2
Merge pull request #22 from loed-idzinga/heroku-staging

Heroku staging
Merge pull request #23 from loed-idzinga/heroku-staging

Error on missing translations
Merge pull request #24 from loed-idzinga/optimalisations

Optimalisations
Add favicons