Merge branch 'mizielr'

Conflicts:
app/Controller/HomeController.php