Resolve conflicts resulting from subtree pull of ob_base upstream
Merge upstream
Add jQuery Update as a dependency
Correction to .gitignore
Merge pull request #13 from bwood/openucb-418-jqueryupdate2

Openucb 418 jqueryupdate2