Added local and session storage for login
Merge branch 'cv-app-xtof' into ctb-cv-app-dev
Fixed merge conflict in app.js