pull translations properly when running from Windows EXE
Fix whitelist functionality
Merge pull request #522 from Atheros1/master

Bug fixes
== should be =
Merge pull request #523 from johnkozan/patch-1

== should be =
Merge remote-tracking branch 'upstream/master'