updating
Merge branch 'master' of https://github.com/jed15/socialwiki