Force mobile recovery flow when 2FA is requested and user does not have mobile #
Remove acl9, replace with SimpleRole

acl9 gem is a little bit opaque, had (at least one) rails 4.1.x incompatibility, and its tests are written in a convluted style with Test::Unit. Since our needs are simple (see what I did there?), rewrite, as SimpleRole, only implementing the methods that we use, and hardcoding (would be simple to generalize, but there is no need) class names for associations.
Rename `has_role!` to `grant_role!`

Also, add tests, remove `has_role_for?(...)`, since it isn't used.
Remove owner association

Since we have roles now, just use that to show ownership of applications
add `revoke_role(...)`
Merge branch 'devel' into feature/simple_role

Conflicts:
	app/controllers/api/v1/tasks_controller.rb
Give application owners correct role on resource
Merge pull request #423 from 18F/feature/simple_role

Remove acl9, replace with SimpleRole
Update ruby to 2.1.3
Merge pull request #422 from 18F/feature/force_2fa_enrollment

Force mobile recovery flow when 2FA is requested and user does not have ...
Merge pull request #425 from dlapiduz/ruby-update

Update ruby to 2.1.3
fix admin user factories (mobile number issues)
Merge branch 'devel' into feature/notification_settings

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'hotfix/fix_2fa_spec' into feature/notification_settings
Separate one-click unsubscribe and notifications settings

Create a controller just for one-click unsubscribe

Create a settings controller with a notifications page