Text changes (thanks to Ralph)
Merge branch 'master' of https://github.com/ossie7/BMT

Conflicts:
	project/assets/lua/helper/fight_helper.lua