rm database.yml from git
add api document
modify api document
change db/schema.rb
Merge branch 'dev' of https://github.com/victorgong/intime into dev
update api document
Merge branch 'master' into dev

Conflicts:
	.gitignore
添加前端获取首页促销信息的api
*.swp -> .gitignore
加上腾讯微博 oauth 登录，修改 current_user
添加首页促销列表的虚拟接口
update api document
update database config
modify api document
Merge branch 'dev' of https://github.com/victorgong/intime into dev
专题列表模拟api
前端api兼容jsonp
rm database.yml form git
add database.yml to .gitignore
添加评论列表、商品列表的api