Sidebar fix, 2nd try
Added option to disable the sidebar, corrected HTML in search form
Merge branch 'sidebar-fix2' into development, style.css conflicts resolved with recompiling