FIX #7:  Bad enconding in some files

Characters fixed.
Merge branch 'bugfix/7-bad_char_encoding' into develop