Removed escaping XML as handled by libstrophe

https://github.com/metajack/libstrophe/commit/4ad21c9283ceae9109ea71860aa27814222c9ee3
Updated man page
Merge branch 'master' into nextdev