merging
Merge branch 'master' of https://github.com/nattofriends/friendzy-client
arbitary merge
changed sub toast to dialog
changed sub toast to dialog