Properties file to utf8
Merge branch 'develop' of https://github.com/barta3/smojeRestPlatform into develop