Added missing localisation for settings/bonus task progress test
Merge remote-tracking branch 'upstream/master' into N2C6

Conflicts:
	Carbonite.Quests/Locales/enUS.lua
	Carbonite.Quests/Locales/zhCN.lua
Resolved merge conflicts