Merge branch 'develop' of github.com:appdevjs/appdevjs_hris into admin-ui