Merge branch 'hotfix/v1.1.0'

* hotfix/v1.1.0:
  Bump version
Fixed pagination templates
Merge branch 'hotfix/v1.1.1' into develop

* hotfix/v1.1.1:
  Fixed pagination templates