Remove duplicates in the list of files passed to NSIS
Unbork ui scaling.
Unbreak ui scaling.
Merge branch 'master' into UICleanup
Didn't actually want to commit the latter ui-scale related change, but rebasing is too annoying, so revert.
OS X build fix
Merge branch 'UICleanup' of https://github.com/Shyotl/SingularityViewer
Merge branch 'master' of https://github.com/lkalif/SingularityViewer