commit progress.
Merge branch 'master' of github.com:ischool-desktop/ischoolJHWishBase