Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop