user_controller spec
merging master