master branch from alljoyn/services/DevModules, tag Qr20130530; dev work through 20130611