Add mapping from ui/ui to toolbar to coincide with the change in Aloha master.
Merge pull request #18 from oerpub/toolbar-fixes-20130829

Add mapping from ui/ui to toolbar
Merge pull request #17 from oerpub/jquery-update-172

Upgrade jquery to 1.7.2.
service gets called but always fails on return
Fix small typo.
Return json or the promise js handlers fail.
Proof of concept file for testing new gdoc2html view.
Add header in attempt to get cross-site scripting to work.
NB: '*' is a dangerous value and **should not be used in production**.
fixed comment typo
add conversion logic
display converted gdoc on page
slight refactor
Merge branch 'gdocservice' into testing