Merge branches 'master' and 'master' of github.com:briansw/building_block
Merge branch 'master' of github.com:briansw/building_block
Fixed jquery ui to be compatible with new version of jquery