fix
merge
sMerge branch 'master' of github.com:atomly/core
fix user service
merge