Merge branch 'builder' of github.com:bitovi/jquerypp into builder