Changed base_url in config.php
Merge branch 'develop'
updated