fix
Merge branch 'master' of https://github.com/rongyiwang/term_with_wechat

Conflicts:
	app/assets/javascripts/turnplate_as.js
Merge branch 'master' of https://github.com/rongyiwang/term_with_wechat

Conflicts:
	app/assets/javascripts/turnplate_as.js