Optimize
Merge branch 'master' into deploy

Conflicts:
	public/index.php