Finish push and kill animations. Fix bug: white mark isn't removed after animation
Fix kill action bug
Merge branch 'dev_ui'

Solve Conflict:
	js/comAI.js