Merge pull request #123 from clintbellanger/master

merge from master
enemy convert_status
initialise convert_status
Merge pull request #811 from RyanDansie/enemy_convert_set_status

convert_status for enemies