small change
Merge branch 'master' into development_l
refactoring user method and view