Merge branch 'hotfix/pagecounter'
Merge branch 'develop'
updated Gemfile