Merge pull request #29 from g2-aj/g3-ks

Deleted system class
Corrected search borrower sql queries