added logic to prevent double slashes in urls
fixed basepath issue
fixed local conflicts
fixed local conflicts
added css causing tei lb tags to create newline, made codesniffer compliant
Merge branch '7.x' of git://github.com/discoverygarden/islandora_critical_edition
Merge pull request #11 from ajstanley/master

Changed <lb> behavior to align TEI with html