lattest changes from Eric
Merge pull request #27 from ktsweb1/devEric

lattest updates from eric *Fixed Merge Issue
fixing merge conflict
Merge branch 'KTSDEV' into KTSSTG