missed json callback
fixed a 404 simplified canvavs setup
added logic to prevent double slashes in urls
fixed basepath issue
first stab at organizing shared canvase callbacks
Merge pull request #8 from MorganDawe/7.x

Fixed a bug with the size of the annotation window appearing over a page.
Merge pull request #6 from willtp87/7.x

7.x
entities integration
variable typo fix
Merge pull request #9 from willtp87/7.x.entities

entities integration
call back updates for image_annotation refactor
coder fixes
renaming of constants
fixed local conflicts
fixed local conflicts
added css causing tei lb tags to create newline, made codesniffer compliant
Merge pull request #10 from willtp87/7.x.post

call back updates for image_annotation refactor
Merge branch '7.x' of git://github.com/discoverygarden/islandora_critical_edition
stoped using deprecated function
Merge pull request #11 from ajstanley/master

Changed <lb> behavior to align TEI with html