WIP
wip
Merge branch 'dev'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	app.rb
	models/account.rb
	models/phone_number.rb
	models/user.rb
	spec/app_spec.rb
	spec/models/account_spec.rb
	spec/spec_helper.rb