Prepared to merge.
Added logic in the battle controller for floating combat text.
Merged with Master