Edited index.php
Merge branch 'master' into promosale_dev