Merge branch 'develop' into code-cleanup
Clean up update and Fighter.java
Merge branch 'code-cleanup' into develop