#2132
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts: Merged
	molgenis-security/src/main/resources/templates/view-usermanager.ftl
Add data-csv and data-excel dependencies for importer
Move common web app config to abstract base class
move bootstrap-fileupload to biobankconnect plugin
#2132
Tests and UI changes
Merge pull request #849 from jjettenn/master

#2132 User Manager
Merge pull request #848 from dennishendriksen/master

Move common web app config to abstract base class + dependency fix
Merge branch 'master' of https://github.com/molgenis/molgenis into
genomebrowser

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppConfig.java