Merge pull request #8 from mguymon/master

Allow newer Devise and small tweaks
Bumped to version 0.3.6
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
Bumping up rails dependency
Adding compatibility with Rails 4. Keeping compatibility with rails 3. Adding support for strong parameters. Fixing form_for which does not allow nil objects(resource). Fixing generators.
Fix on view template
Fixed status update flash message
Added user email to saved cookie to differentiate users
Changed remember cookie to a non-session one
Updated gitignore due to updated rvm
Merge branch 'feature/rails4' of github.com:ronald05arias/devise_google_authenticator into ronald05arias-feature/rails4

Merging a Rails4 compatible pull request from ronald05arias
Minor adjustments to update controller code to align with updated Devise
Update to 0.3.7
Merge branch 'master' of github.com:harrystech/devise_google_authenticator into harrystech-master

Conflicts:
	app/controllers/devise/displayqr_controller.rb
	test/integration/gauth_test.rb
Fixing remember me function from setting a cookie if the value is set to nil
Updated to 0.3.8
Updated README with slight amendments for the new remember feature