fix bug
Merge branch 'wuxi'

Conflicts:
	app/assets/javascripts/turnplate_bs.js
	app/views/turnplate_bs/index.html.erb