config.php file and first half view modified
Merge origin/master