Merge branch 'master' of https://github.com/lanyanai/jingtang

Conflicts:
	.idea/workspace.xml
	uxbaoWeb/游戏宝/css/rank.css
2014-07-09
Merge branch 'master' of https://github.com/lanyanai/jingtang.git