Update index.php
develop
develop changed
Merge branch 'develop'

* develop:
  develop changed
  develop
  Update index.php

Conflicts:
	index.php