Repair

Fix various bits and pieces
Merge branch 'master' of https://github.com/srpatel/Spaceheist

Conflicts:
core/src/com/xikka/spaceheist/module/repair/Repair.java
core/src/com/xikka/spaceheist/spaceScape/Spacescape.java
Merge branch 'master' of https://github.com/srpatel/Spaceheist

Conflicts:
	core/src/com/xikka/spaceheist/module/Module.java
	core/src/com/xikka/spaceheist/module/generator/Card.java
	core/src/com/xikka/spaceheist/module/laser/Laser.java
	core/src/com/xikka/spaceheist/module/repair/Repair.java
	core/src/com/xikka/spaceheist/spaceScape/Spacescape.java
	core/src/com/xikka/spaceheist/spaceScape/ship/part/Turret.java
	core/src/com/xikka/utilities/Pair.java
Fix conflicts