Removed unnecessary player unit check (to see if player unit is still alive) since main_player_alive check in main.js handles it already.
Merge remote-tracking branch 'upstream/master'