User changes
Merge branch 'master' of https://github.com/majest/go-user-service

Conflicts:
	user/user.go