Merge branch 'av_groupchats'
fix #697 (Setting alias isn't persistent for some contacts)
Merge branch 'pr712'
fix ToxID from QString convertation
cleanup setting.ini file after a fiend removing
Merge branch 'pr714'
Start preparing for OS X auto-update

Updates are still disabled by default on OS X, and the public key is likely to change
more robust exporting, fixes #716
Merge branch 'pr721'
Build our Settings after our QApplication, fixes crash on startup

Thanks to @stqism for reporting the crash

This is why global static variables are evil
Fix #719
fix minor switching bug introduced by 07ea2e
Merge branch 'pr723'
fixes #207

Adds parsing for command-line arguments/flags
fixes unreported bug in styles
split message fix
Merge branch 'pr725'
Merge branch 'pr732'
Merge branch 'pr730'
Fix use after free of groupchat invites

Fixes #728, fixes #706, fixes #394