resolved conflicts from merging sofathitesh theme file changes.  conflicts due to windows newlines.
resolved conflicts from merging sofathitesh theme file changes.  conflicts due to windows newlines.

BRL-CAD/web,BRL-CAD/web,BRL-CAD/web,BRL-CAD/web,BRL-CAD/web,BRL-CAD/web,BRL-CAD/web