Merge pull request #1318 from dennishendriksen/master

Fix #1317 Spinner not hidden in case of nested spinners + various fixes
Merge branch 'master' of https://github.com/molgenis/molgenis