Merge remote-tracking branch 'statusnet/master'

This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.

Conflicts:
	doc-src/about
	doc-src/faq
	plugins/OpenID/doc-src/openid

diff --cc lib/action.php
Simple merge

diff --cc locale/ca/LC_MESSAGES/statusnet.po
Simple merge

diff --cc plugins/OStatus/actions/ostatusinit.php
Simple merge