Add: git clone address
fix indet
Merge branch 'yang' into dev
start search result
Add: product search and return

site#index_search_result action and index_search_result.html.erb
Merge branch 'yang' into dev
修改了分类的主页样式
add capistrano and remove ckeditor
Merge branch 'gang' into dev
修改分类主页
Conflicts:
	app/views/site/index_cats.html.erb
单个商品和用户中心
merged with hbb
Merge branch 'yang' into dev
Merge branch 'dev' of github.com:onecampus/wine into dev
Update: git from git to https
add .capistrano to .gitignore
Merge branch 'yang' into dev
Merge branch 'dev'