enable user to link coursemology account with their facebook account in the setting page.
Merge branch 'master' of github.com:Coursemology/coursemology.org

* 'master' of github.com:Coursemology/coursemology.org:
  fix for logo proposition problem
  fixed update user profile error page