Adding Java 7 support on Heroku
Convert to UTF-8
Fix encoding problems