Merge pull request #4 from friendica/master

Fast forward local hub
Merge pull request #6 from tuscanhobbit/master

Fast forward local hub
Merge from origin
Merge from master
one more hidden config
Merge pull request #637 from tuscanhobbit/dev

one more hidden config option