Code refactorization
Merge branch 'DanielWork'
Merge branch 'master' of https://github.com/Scthe1311C/Project-PSW-L

Conflicts:
	controllers.php
	index.php
	src/templates/gallery-view.php