Javadocs for shields, weapons, and a few controllers - Kevin (kchen87)
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/equipment/weapons/BeamLaser.java
	src/com/teamoxygen/spacetraders/equipment/weapons/MilitaryLaser.java
	src/com/teamoxygen/spacetraders/equipment/weapons/PulseLaser.java
	src/com/teamoxygen/spacetraders/view/CombatController.java
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders