苏宁
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/jquery.fancybox.js
	app/assets/javascripts/soundmanager2.js
共用修改
共用JS
Merge branch 'master' of https://github.com/rongyiwang/rongyi_term_lottery
苏宁修改