Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
	modified:   view/theme/smoothly/style.css
Merge pull request #621 from annando/master

Using "term" table to improve performance, OStatus autocomplete, some more performance stuff
Merge branch 'master' of https://github.com/friendica/friendica
rev update
Merge https://github.com/friendica/friendica into pull
reorder the update of the item table as instructed by Michael Vogel
Merge pull request #622 from zzottel/master

reorder iteam table update
Merge branch 'master' of https://github.com/friendica/friendica
quattro: fix item max-width, fix contact serarch autocomplete popup style
quattro: autocomplete private message To field
update IT strings.php
Merge pull request #623 from fabrixxm/master

IT strings update
Merge pull request #624 from fabrixxm/quattrofixs

Some fixs to Quattro theme
rev update
Merge https://github.com/friendica/friendica into pull
Merge branch 'master' of https://github.com/friendica/friendica
make sure conv_as->items is an array or don't proceed
admin option to disable post content in email notifications for the site