[tx-robot] updated from transifex
Add Contacts repo to CONTRIBUTING.md
Merge pull request #3366 from owncloud/contributing_add_contacts

Add Contacts repo to CONTRIBUTING.md
Fix finding mount in background watcher, fixes #3353
Add Compound property to avoid double escaping values.
fix for losing mount point "/"
Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point

fix for disappearing root mount point on lib/files/filesystem.php
No unit test coverage reports for pgsql - this causes issues on Jenkins.
Merge pull request #3374 from owncloud/vobject_compound_property

Add Compound property to avoid double escaping values.
Merge branch 'master' into fix-3353
Merge pull request #3371 from owncloud/fix-3353

Fix finding mount in background watcher, fixes #3353
[tx-robot] updated from transifex
Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
Line length etc.
Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dialogs_oc_template

Conflicts:
	core/js/oc-dialogs.js