Merge branch 'master' of https://github.com/mszkodzinski/19115

Conflicts:
	public/index.php