dist-ci.xml had merge problems
dist-ci.xml had merge problems

blackberry/Ripple-Framework,blackberry/Ripple-Framework,blackberry/Ripple-Framework,blackberry-webworks/Ripple-Framework,blackberry/Ripple-Framework,blackberry-webworks/Ripple-Framework,blackberry-webworks/Ripple-Framework,blackberry-webworks/Ripple-Framework,blackberry/Ripple-Framework