Removed duplicated code logic and free allocated WidgetLabel object.
Fixes #319.
Merge remote-tracking branch 'upstream/master' into bugfixes

Conflicts:
	src/CombatText.cpp
Merge pull request #321 from hean01/bugfixes

Removed duplicated code logic and free allocated WidgetLabel object.