Merge branch 'master' of https://github.com/Nonanick/auria

Conflicts:
	public/home.php