added logic to prevent double slashes in urls
fixed basepath issue
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
Merge pull request #12 from willtp87/7.x.fixes

7.x.fixes
doc
moved readme to .md to take advantage of github display