-
Merge branch 'master' of https://github.com/Tietoarkisto/metka

Conflicts:
	metka/src/main/webapp/resources/js/modules/inputField.js