add .ruby-version and .ruby-gemset to .gitignore
Merge branch 'master' into dev

Conflicts:
	.gitignore
添加前端获取首页促销信息的api