Merge origin/master

Conflicts:
	index.php
Merge origin/master
Merge origin/master

Conflicts:
	index.php
Merge origin/master