fix #1177 popover text overflow
Merge pull request #1262 from dennishendriksen/master

fix #1177 popover text overflow
Fix upload zip file containing csv files
Use constants
Merge pull request #1263 from erwinwinder/master

Fix upload zip file containing csv files
Merge remote-tracking branch 'upstream/master'