school-principle styling
resolved merge conflict from sidebar
Merge pull request #21 from saulelis/sidebars

school-principle styling
Merge branch 'master' into top_menu
general fixes here and there