Styling changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/uq/deco7381/runspyrun/activity/AttackActivity.java
fix detection plate in Defence mode
Adjusted UI for consistency
Fixed layout issues
cool!
Merge remote-tracking branch 'origin/GuiTest' into GuiTest