folded search_layout into layout, added search- prefix to rules in search_style.css
Merge branch 'master' of https://github.com/KenYHT/CapaCity