Cleaned index.php file
Merge remote-tracking branch 'origin/sim'

Conflicts:
	index.php
Merge branch 'master' of https://github.com/uc-pkm/testing.git