Fixed Gemfile's sqlite3 version so tests would run
Added ability to not require token for a user if they have logged in recently
Add error message
Merge pull request #1 from harrystech/add_error_msg

Added error message for login failure
Fixed status update flash message
Added user email to saved cookie to differentiate users
Changed remember cookie to a non-session one
Merge remote-tracking branch 'harrystech/master'

Conflicts:
	app/controllers/devise/displayqr_controller.rb