Merge branch 'foundation-conversion'
Updated config.json with new settings
Merge branch 'add-search'
Added search.php.