完善搜索网点
Merge branch 'develop' into feature/build_production

Conflicts:
	app/controllers/api/v1/recommends_controller.rb
搜索网点增加production_id 过滤.
Merge branch 'feature/build_production' into develop
dev sms
dev sms send
2013.6.8.09.07
add user_uuid to verification_codes
add user_uuid to verification_codes
 1
Merge branch 'develop' of 192.168.1.126:gold_cat into develop

Conflicts:
	spec/apis/v1/controllers/address_spec.rb
2013.6.8.18.05
address dev&test finished
resolve conflicts