fix model friendship temporarily
Merge branch 'master' of https://github.com/aghoneim0/CMPUT-410-Winter-2014