Merge branch 'master' of https://github.com/Belgarion/Sputnik

Conflicts:
	src/weapons/Beam.java