Merge remote-tracking branch 'friendica/develop' into issue/#3062

# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php

diff --cc boot.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc view/theme/duepuntozero/theme.php
Simple merge

diff --cc view/theme/smoothly/theme.php
Simple merge

diff --cc view/theme/vier/theme.php
Simple merge