2014.12.18更新
Merge remote-tracking branch 'origin/master'

Conflicts:
	userButton/00-FirefoxBtnMod.uc.js