图片上传到七牛云
增加User表中的name
Merge branch 'qiniu'

Conflicts:
	config/database.yml
	db/schema.rb
Merge branch 'master' of https://github.com/dreamlx/xiadan_me into xiaolong
更新bug
更新bug
增加rake task
rake task 部署资源到qiniu
重新修改something.rake文件
删除一些垃圾文件
Delete 93vlzlK9UlO6UhZaVlrZ4RyVanIv5f1meAX_ofK2,
修改something.rake 判断是否需要修改配置文件
Merge branch 'xiaolong' of https://github.com/dreamlx/xiadan_me into xiaolong
	modified:   app/models/service_menu.rb
	modified:   app/models/technician.rb
Merge branch 'xiaolong'

Conflicts:
	config/database.yml
	modified:   Gemfile.lock
	deleted:    db/migrate/20130802032702_add_column_name_to_users.rb
	deleted:    db/migrate/20130802033411_create_comments.rb
	deleted:    db/migrate/20130802072453_rename_column_girl_id_to_work_relationships.rb
	modified:   db/schema.rb
remove default url