added promises in USER module
merge issues
fixing merge issues
no idea whats going on
yan na