Merge tag '1.0.18.1' into develop

Back to Rails 4.1.8

* tag '1.0.18.1':
  fix test
  redirecting to users in admin panel
  add tabs
  migrate db
  fix bu with state_machine
  remove state index users
  update rails
  edit travis yml
  update gems
  remove border bottom from video
remove active record base method
Merge branch 'release/1.0.18.2'

* release/1.0.18.2:
  remove active record base method