commiting changes to hs_main and message.java for invalid xml char