Merge branch 'hotfix/v1.1.1'

* hotfix/v1.1.1:
  Fixed pagination templates
Added composer
Merge branch 'hotfix/v1.1.2' into develop

* hotfix/v1.1.2:
  Added composer