Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Admin panel: show if an account has expired
kill some newlines
Merge pull request #629 from tobiasd/admin-info

Admin info