make -Cpo update-po
Needle Gun: (RailGun1Mk1) weight 400 -> 1000
Update changelog for 3.1.1
Merge branch 'newbugfixes'

Conflicts:
	data/mp/stats/weapons.txt