Version 1.02 [4/6/2013]

Fix for combattext. It will require a relog or client reload to see the
change. If nothing changes, either change the combattext to something
else and then back to Expressway or reset your profile and run the
install again.
Merge remote-tracking branch 'upstream/master'