Merge branch '3.6-release'

To fix wrong merge of 3.6-rc

Merge pull request friendica#433 from annando/dba-things

Additional work for PR 3778

Merge pull request friendica#430 from tobiasd/master

added ZH-CN translation of cal addon, thx mytbk

Merge pull request friendica#414 from Hypolite/improvement/move-app-t…

…o-src

Move app to src

Merge pull request friendica#407 from annando/removed_lockpath

Deprecated parts removed

js_upload - provide a site tmp directory config in case your service …

…provider has an unusually small /tmp partition

package update

Merge https://github.com/tonybaldwin/friendica-addons into apull

Conflicts:
	posterous/posterous.php

package update

please use make to build packages