Replaced admin with borrower, broke 10 specs
closes issue#22
saved to merge with master
Fixed merge conflicts
Merge pull request #27 from 121watts/issue#22

Issue#22