Merge branch 'master' of https://github.com/Setebos/Gallery

Conflicts:
	app/vue/home.php
resolve conflicts