Correct character encoding of properties file
Merge branch 'integration' into dryad-dev