Merge remote-tracking branch 'origin/master' into Cole
Merge remote-tracking branch 'origin/master' into Cole
Fixed lightning tower so it doesnt back between two twoers.
Fixed aoe tower hopefully
Increased lightning bounce range
Cleaned up upgrade ui
Merge remote-tracking branch 'origin/master' into Cole

Conflicts:
	TowerDefense/src/com/group23/towerdefense/screen/GameplayScreen.java
	TowerDefense/src/com/group23/towerdefense/tower/AoeTower.java
	TowerDefense/src/com/group23/towerdefense/tower/Tower.java