Fix bug with new remember token method
Merge branch 'fix-regression'

* fix-regression:
  Fix bug with new remember token method

Conflicts:
	app/helpers/sessions_helper.rb
Remove obsolete encrypt method