TH-03 | login/signup recommit
Merge remote-tracking branch 'origin/TH-03' into dev1.0