cleaned up dbInterface unlock user function and bug fix on Role
Merge branch 'trevorLocal'