Update from upstream 0.3.6, TB 17.0-24.0 https://addons.mozilla.org/en-us/thunderbird/addon/gcontactsync/

Code is copyright Josh Geenan, under Mozilla Public License
Merge branch 'master' of github.com:wangd/gContactSync-UI-fork