add new fields to user and rename phone_number
rename phone_number in views
find all phonenumbers and replace them to phone_number
Merge branch 'master' of github.com:DonutWorks/Ari into add-new-fields-to-user

Conflicts:
	db/schema.rb
Merge pull request #125 from DonutWorks/add-new-fields-to-user

#124 Add new fields to user