20130927
Merge branch 'master' of https://github.com/iknowyoudidnotaskforit/screwingxmpp