Merge branch 'hotfix/gemfile'
Update gems
Update permalink
Add PaperFaces portrait
Merge branch 'hotfix/updates' into develop