Correctly init the shot timer to avoid double shot the first time
Merge Zerg into master.