update with login function
Merge branch 'devBrian'