code change 123456
is login and logout dev
代码融合用户验证模块,所有测试加入用户验证
Merge branch 'develop' of 192.168.1.126:gold_cat into develop

Conflicts:
	app/controllers/api/v1/users_controller.rb
修改冲突
可以自定义用户登陆
user_coupons dev finished
change cellphone deve
resolve confilict
忘记密码
fix conflic
Merge branch 'berek' into develop
fix user_spec bug
fix test bug
fix conflict
401 rspec
address 增加用户模块,修改测试文件
Merge branch 'feature/address' into develop

Conflicts:
	app/controllers/api/v1/users_controller.rb
Transaction to transaction
接口返回结果修改