DE: update to the strings
rev update - add cancel markup to editor
Merge https://github.com/friendica/friendica into pull
permissions selector showing up for guests, testbubble and smoothly
DE: update to the strings
Make 'Friendika' 'Friendica' in open search.
Merge branch 'master' of https://github.com/friendica/friendica
frost: added some missing baseurls to nav.tpl
various bug fixes
missed one
Merge pull request #478 from fermionic/frost-improvements

Frost improvements
dont insert images larger than scale level 2
bug 479 - typo in database.sql
rev update
Merge https://github.com/friendica/friendica into pull
quattro: first work on font size options
fix item_id table
Merge pull request #480 from pixelroot/master

Bug fixes
	new file:   view/theme/smoothly/default.php
	new file:   view/theme/smoothly/footer.tpl
	new file:   view/theme/smoothly/header.tpl
	modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
Merge pull request #481 from pixelroot/master

Better mark new posts