fixed index.php
fixed some bugs with index
Merge branch 'develop'