Committing
Merge branch 'FTR-26_DEFAULT_VISUALS' of
https://github.com/otavanopisto/muikku.git into FTR-26_DEFAULT_VISUALS

Conflicts:
	muikku/src/main/webapp/resources/theme-muikku/css/screen.css
	muikku/src/main/webapp/resources/theme-muikku/sass/_widgets.scss