#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
Add primitive error handling for rest and search API
Added some example workflows which the data entry plugin should be able to consume
Merge branch 'master' of https://github.com/molgenis/molgenis
Code cleanup (resolves FindBugs warning)
Check type before cast (resolve FindBugs warning)
Check before cast (resolve FindBugs warning)
Mark members as transient (resolve FindBugs warnings)
Do not expose mutual objects (resolve FindBugs warnings)
Add equals/hashcode (resolve FindBugs warning)
Rewrite compare to resolve FindBugs warnings
Use Integer.valueOf instead of new Integer (resolve FindBugs warning)
Remove unused variable
Serializable fixes (resolve FindBugs warnings)
Merge pull request #852 from dennishendriksen/master

Resolve FindBugs warnings
Merge pull request #853 from erwinwinder/master

Close stream in case of exception