Fixing minor bugs for release. Adding code to deal with carriage returns in data and convert to br tags.
Updating SHIVA to bills latest code sn versionn 7.x-1.4beta