Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-core-ui/src/main/resources/templates/molgenis-input-elements.ftl
Merge pull request #1823 from fdlk/master

Improve formatting and fix validation of input elements
Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap

Conflicts:
	molgenis-core-ui/src/main/resources/templates/molgenis-input-elements.ftl