remove border bottom from video
update gems
edit travis yml
update rails
remove state index users
fix bu with state_machine
migrate db
add tabs
redirecting to users in admin panel
fix test
back to rails 4.1.8
Merge branch 'release/1.0.18.1'

* release/1.0.18.1: (25 commits)
  back to rails 4.1.8
  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
  lock colorize and capistrano version
  fix vimeo
  fix assets
  remove charts.js
  update gems
  replace video on main page
  replace vimeo video
  upgrade video embed
  add chart js
  ...

Conflicts:
	Gemfile
	Gemfile.lock
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
Mergte tag '1.0.18.2' into develop

Remove Rails 4.2 method

* tag '1.0.18.2':
back to rails 4.1.7
Merge branch 'release/1.0.18.3'

* release/1.0.18.3:
  back to rails 4.1.7
Merge tag '1.0.18.3' into develop

Back to Rails 4.1.7

* tag '1.0.18.3':
add wij editor