Added phone field on addresses table
Fixed address book
Merge branch 'wimoto_dev' of github.com:MediaSapiens/flamaster into wimoto_dev