Merge origin/master

Conflicts:
	public/index.php