Fix file encoding problems
Merge branch 'develop-fix-properties' into develop