normalized license & properties

git-svn-id: https://svn.crosswire.org/svn/sword/trunk@2989 bcd7d363-81e1-0310-97ec-a550e20fc99c
committed Kostya's 2013-11-21 patch

git-svn-id: https://svn.crosswire.org/svn/sword/trunk@2990 bcd7d363-81e1-0310-97ec-a550e20fc99c
Don't generate linebreaks for <lb type="x-optional"/>, which comes from USFM //.

git-svn-id: https://svn.crosswire.org/svn/sword/trunk@2991 bcd7d363-81e1-0310-97ec-a550e20fc99c
Merge branch 'master' into xiphos-patch