Merge origin/master

Conflicts:
	src/public/index.php
Finished study application: Albums