add index.php
5
Merge branch 'master' into dev

Conflicts:
	index.php