Merge remote-tracking branch 'upstream/master'

New stuff from upstream
Merge remote-tracking branch 'upstream/master': new changes and merged features
Merge remote-tracking branch 'upstream/master'
Merge pull request #329 from Atheros1/master

Move code to add sockslisten option
Added 'sqlite3' as to the includes when building for OS X
Merge pull request #332 from Atheros1/master

Prompt user before connecting the first time
Merge pull request #333 from Atheros1/master

Further work to implement the Connect dialog on startup
Merge pull request #330 from gnumac/master

Added 'sqlite3' to the includes when building for OS X
Merge remote-tracking branch 'upstream/master': Pull latest updates
initial commit. Probably broken.
Remove selecting of next message.
It doesn't seem to be necessary, and it would always fail if there was only
one message in the inbox.
Tabs are the root of all evil
more comments on the mark unread implementation
updated Russian translation: new translations dealing with chans
updated Russian translation: new translations dealing with chans
Merge pull request #339 from akh81/master

 Updated Russian translation: new translations dealing with chans
Merge pull request #335 from nimdahk/markUnread

"Mark Unread" in Inbox
Increment version number to 0.3.5