Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
bug fix, wrong js lib included
Merge pull request #1112 from tugelbend/master

bug fix: library shouldn't be included remotely