ZBMed and Pensoft changes
Correct encoding of properties file everywhere

It's silly that this setting is in so many places.... We should clean
it up when we move the config into the database.
Merge remote-tracking branch 'laurawendell/patch-47' into integration
Merge branch 'integration' into dryad-dev