Merge branch 'dev'

Conflicts:
	index.php
Merge branch 'dev'

Conflicts:
	index.php