Merge branch 'hotfix/remove_fix_me'

* hotfix/remove_fix_me:
  fix failed tests
  remove all fix me
Increasing the image size onclick on page /welcome/contacts
fix conflicts
remove prawn from github
fix old school hash
try to edit travis.yml
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