Merge branch 'develop' into issue/#3062

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