Change phone_number type from int to string in Users table
Merge branch 'alpha'