Merge pull request #744 from annando/master

- More visible reshares
- lockfile for onepoll.php
- clear old smarty3 cache files
- rework tag serarch
- add more logs for diaspora messages
PT BR: update to the strings
move register_adminadd_eml.tpl to view/en/
Merge pull request #751 from fabrixxm/master

move register_adminadd_eml.tpl to view/en/
Merge remote-tracking branch 'upstream/master'
redoing the change concerning the hostname.