Merge branch 'master' into develop

diff --cc boot.php
Simple merge

diff --cc mod/network.php
Simple merge

diff --cc mod/settings.php
Simple merge

diff --cc src/App.php
Simple merge

diff --cc src/Content/Nav.php
Simple merge

diff --cc src/Content/Text/BBCode.php
Simple merge

diff --cc src/Module/Profile.php
Simple merge

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