Fix #457.
Fix #458.
Merge branch 'master' of github.com:FreezingMoon/AncientBeast

Conflicts:
	combat/js/ui.js