Merge branch 'hotfix/news_tags' into develop

* hotfix/news_tags: (30 commits)
  strip tags from news
  fix news reverse on pages
  new pg gem 0.17.0
  fix locales
  fix locales
  bundle
  gemfile.lock
  remove syntax_fix gem
  syntax fix
  refactoring
  refactoring
  somerefactoring
  made modern hashes in Gemfile
  edit travis.yml
  edit travis
  remove dublication in Gemfile
  edit travis.yml
  add new script to .travis.yml
  fix report_schedule
  add new gem for errors
  ...
Merge branch 'hotfix/fix_genres_show' into develop

* hotfix/fix_genres_show:
  fix bug with show_genres
  return dots for news decorator
  fix something
Merge branch 'hotfix/up_coverage' into develop

* hotfix/up_coverage:
  upcoverage
  remove unusing decorator
  remove unusing decorator
  remove test_unit_helpers
  add helper teacher functions
Merge branch 'hotfix/remove_fix_me' into develop

* hotfix/remove_fix_me:
  fix failed tests
  remove all fix me
Merge branch 'develop' of github.com:kalashnikovisme/sky_dance into develop

* 'develop' of github.com:kalashnikovisme/sky_dance:
Travis precompile added
Travis updating
Travis trying 1
Travis trying 2
Travis trying 2
Travis trying 4
Merge branch 'hotfix/travis_test_pass' into develop

* hotfix/travis_test_pass:
  try to edit travis.yml
  fix old school hash
  remove prawn from github
  Increasing the image size onclick on page /welcome/contacts

Conflicts:
	.travis.yml
edit db
Merge branch 'release/1.5'

* release/1.5:
  Travis trying 4
  Travis trying 2
  Travis trying 2
  Travis trying 1
  Travis precompile added

Conflicts:
	.travis.yml