jquery-ui theme "muikkufied"
Merge branch 'devel' of https://github.com/otavanopisto/muikku.git into
devel

Conflicts:
	muikku/src/main/webapp/resources/sass/_commons.scss