CS: update to the strings
red hash icon 16px imported from red
make red# available as a smilie
Merge pull request #684 from tobiasd/rhash

Rhash
provide bbcode translation for imported red zmg tag (img tag with zot-id)
Merge https://github.com/friendica/friendica into pull
fix bug #540 for quattro themes
Merge pull request #685 from tobiasd/540_for_quattro

fix bug #540 for quattro themes
Fix tiny typo on mod/uimport.php
Merge pull request #686 from abinoam/master

Fix tiny typo on mod/uimport.php
fix 540 in vier
Merge pull request #687 from tobiasd/bug_540

fix 540 in vier
DE: update to the strings
PT-BR: update to the strings
PT-BR: update to the strings
quattro: show notification number in favicon
Merge pull request #688 from fabrixxm/quattro

quattro: show notification number in favicon
eliminate Cropper conflicts with jQuery
remove some now-unnecessary templates
Merge pull request #689 from fermionic/20130601-cropper-frost-fix

Modify Cropper to avoid conflicts with jQuery