incomplete os x instructions
minor fixes
minor fixes
Merge branch 'master' of https://github.com/tux3/qTox
conform to standard, fix bug related to nospam in ID
minor
revert special self avatar
blasted scoping issue
Merge branch 'pr330'