add comments explaining redundant app ownership
Merge branch 'devel' into feature/2fa

Conflicts:
	app/models/user_action.rb
	config/initializers/devise.rb
	db/schema.rb
2FA/SMS Warden Strategy

- Initial checkin of 2FA framework
- SMS 2FA strategy
- modifications to MobileConfirmation model
First pass for 2FA with SMS

- On admin access, redirect user to 2FA flow
- Implement SMS 2FA with code stolen from mobile recover flow (TODO: remove actual SMS from recovery flow, instead leverage SMS 2FA)
- two_factor_spec.rb to test 2FA flow
Clean up 2FA tests
Merge branch 'feature/admin_role' into feature/2fa

Conflicts:
	app/models/user.rb
	config/initializers/devise.rb
	db/schema.rb
Handle errors in SMS 2FA

- handle errors
- use factors/sms routes for resend, etc
- support resend code
Use sms/2fa for mobile recovery

- integrate sms/2fa flow to mobile recovery flow
- rename MobileConfirmation model SmsCode
move incomplete admin page to spec_helper, remvoe old secret template
FTE should always redirect to mobile recovery flow
Merge remote-tracking branch 'origin/devel' into feature/2fa
Allow email to be used instead of Twilio/SMS in dev for 2FA
log in the sms_code object for 2FA
Merge pull request #406 from 18F/feature/2fa

Feature/2fa
factor out roles helper into module

Becuase `Doorkeeper::ApplicationController` does not inherit from our `ApplicationController`, it does not get helper methods defined in `ApplicationController` ... but it can get mixins.
Merge pull request #415 from 18F/hotfix/roles_helper

factor out roles helper into module
Add tests around session controller redirects

Test that the redirects are working correctly for various states of signed-in-ness.
Merge pull request #416 from 18F/hotfix/session_controller_redirect_specs

Add tests around session controller redirects
Fix the MyUSA URL sent out in mails
Merge pull request #418 from 18F/hotfix/staging-mail-url

Fix the MyUSA URL sent out in mails