completed login workflow capability
fixed merge conflicts on studentportal.js