Merge branch 'master' of github.com:javerous/torchat-mac