Backport address book selector.
fix for read file by using the view object this will fix reading encrypted files
Update bookmarks.php
Fallback to png in decrepit browsers
use non-static public api OCP\Defaults
disable gallery sharing if encryption is enabled until this is solved: https://github.com/owncloud/apps/issues/1186
disable gallery sharing if encryption app is enabled
Merge pull request #1196 from owncloud/no_gallery_sharing_if_encryption_enabled

for now disable gallery sharing if encryption is enabled
ORG is an array. Fix owncloud/contacts#143
Replace shorttag
Load user_external before login
replace close button

Conflicts:
	files_pdfviewer/templates/pdf.php
download button misteriously disapeared

Conflicts:
	files_pdfviewer/templates/pdf.php
dnld button

Conflicts:
	files_pdfviewer/templates/pdf.php
Merge pull request #1202 from owncloud/backport_pdf-closebutton

Backport pdf closebutton
Merge pull request #1201 from owncloud/fix_gallery_shorttag

Replace shorttag in gallery template
Merge remote-tracking branch 'upstream/stable5' into workaround_getid3_oc_wrapper