Put dir back - the fat lady didn't sing afterall.
Merge pull request #720 from magicoli/master

update fr
Merge pull request #2 from friendica/master

Pull from friendica/master