Merge branch 'hotfix/add_pagination'

* hotfix/add_pagination:
  add makeup pagination
  add pagination to news
fix news decorator
add youtube auto html
Merge branch 'hotfix/add_auto_html_gem'

* hotfix/add_auto_html_gem:
  add youtube auto html
  fix news decorator
Merge branch 'hotfix/add_auto_html_gem' into develop

* hotfix/add_auto_html_gem:
  add youtube auto html
  fix news decorator
Merge branch 'hotfix/testing_auto_html_fork' into develop

* hotfix/testing_auto_html_fork:
add google map
add google_maps
remove sqlite-journal
edit .gitignore
Merge branch 'hotfix/add_google_map' into develop

* hotfix/add_google_map:
  edit .gitignore
  remove sqlite-journal
  add google_maps
  add google map