Merge Friend table into Profile table
Merge pull request #226 from ratan12/Databasemerge

Merge Friend table into Profile table