Merge branch 'master' of github.com:chimpanze/facebook_news