improved modals
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel

Conflicts:
	app/webroot/css/meta.css