Merge pull request #1 from friendica/master

Red master has been merged
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red into upstream
Merge branch 'upstream'
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
Merge branch 'master' of https://github.com/friendica/red
notifications/system not marking all notifications seen
more diaspora heavy lifting
sort out some anomalies
more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs
get rid of template "auto generated" warnings
Merge branch 'master' of https://github.com/friendica/red
HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it
as an option.