The attack screen now works to an extent. Also ugly water is being drawn.
Merge branch 'CG'
Merge branch 'master' into CG