Updated Readme
Merge branch 'master' into user_association

* master:
  Updated Readme