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

Conflicts:
	molgenis-app-omx/src/main/resources/molgenis.properties
Merge pull request #1449 from erwinwinder/master

Api token login