Fix merge issue
Merge branch 'master' of github.com:tmacdona/BeSocial