fixed another xml-encoding-fckp
fixed another xml-encoding-fckp (rollback)
fixed another xml-encoding-fckp (rollforward)
Merge branch 'master' of https://github.com/eazyliving/firtz into osf