Merge branch 'dev-fbcanvaslogin' into sta-fbcanvaslogin
Merge branch 'dev' into sta