Merge branch 'hotfix/travis_test_pass'

* hotfix/travis_test_pass:
  try to edit travis.yml
add test assets precompiling
remove bad gems and replace assets:precompile for test
unreplace db:migrate and assets:precompile
fix something to pass test on travis
replace bad gems
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
fix .travis.yml
add verify tag for reformal
Merge branch 'develop'

* develop:
  add working search input
  add assets:precompile false to develop evn
fix locales in about page
replace css to sass
Merge branch 'hotfix/css_to_sass'

* hotfix/css_to_sass:
  replace css to sass
Merge branch 'hotfix/css_to_sass' into develop

* hotfix/css_to_sass:
  replace css to sass
  fix locales in about page
  add verify tag for reformal
  fix .travis.yml
  edit db
  replace bad gems
  fix something to pass test on travis
  unreplace db:migrate and assets:precompile
  remove bad gems and replace assets:precompile for test
  add test assets precompiling
rereplace fotorama
replace js to coffe
Merge branch 'hotfix/js_to_coffee' into develop

* hotfix/js_to_coffee:
  replace js to coffe
  rereplace fotorama