Fixed some points and a bad merge

Fixed Rifle Grenades in Japan
Fixed Lokhust Mech Cost
Fixed bad merge that somehow copied stuff from one of the forks.