user controller update + address
Merge branch 'vince_develop' into develop