Merge branch 'master' of https://github.com/mixuuu/lauta

Conflicts:
	public/index.php
Merge branch 'master' of https://github.com/mixuuu/lauta

Conflicts:
	public/index.php