login with phone number
#116 user acceptance test
refactoring code on view
cancel button at user edit page leads you to user detail page.
admin can check activated users.
Merge branch 'feat/issue-225' of https://github.com/DonutWorks/Ari into feat/issue-225
add a flash message for failing to login via phone_number
handling a case when account_activation is nil, added tests.
schema re-generated
Merge branch 'develop' of github.com:DonutWorks/Ari into feat/issue-225_
Merge pull request #231 from DonutWorks/feat/issue-225

Feat/issue 225
Merge branch 'develop' of https://github.com/DonutWorks/Ari into feature/show-message-list

Conflicts:
	db/schema.rb
Merge pull request #232 from DonutWorks/feature/show-message-list

#224 show message list
Merge pull request #237 from DonutWorks/test/acceptance-user

#116 user acceptance test
Merge pull request #239 from DonutWorks/bug/issue-213

cancel button at user edit page leads you to user detail page.
Merge pull request #240 from DonutWorks/feat/issue-214

admin can check activated users.
Merge branch 'develop' of github.com:DonutWorks/Ari into feat/choose-users-who-to-send-sms
send_sms is not equal to send_sms!