Merge branch 'mentor' of https://github.com/CliffRegis/HRkin
various changes
Merge branch 'master' into paid_users