More work
Merge branch 'master' of https://github.com/morpheusbeing/retroshare_plugin_writing