Minor formatting changes to test the auto-formatter
Updated the eclipse preferences file

To fix minor problems with the formatter
Fixed merge conflicts
Merge branch 'production' into Canfield
Added more javadoc warnings to enforce standards

This enables more visible enforcement of our existing standards
Fixed warnings, except 2 that are documented & UI warnings
Tests for StationaryEntity.update & Effect.update
Fixed Tank decelerate test fail

Also added a check that prevents the tank from accelerating or
decelerating multiple times per tick (this could be possible if multiple
controllers called accelerate or decelerate on the tank in a single
tick)
Added Engineer.update test
Fixed problem w/ single-frame image orientation
Merge pull request #188 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Removed auto-created merge conflict files
Merge pull request #189 from BU-CS673/Canfield

Removed auto-created merge conflict files
Copyright notice is now listed in header

This is required to apply our license.
Merge pull request #192 from BU-CS673/Canfield

Copyright notice is now listed in header
Removed unused params in Tank.fireCannon

No longer needed b/c of changes to the way that method works.
Merge pull request #193 from BU-CS673/Canfield

Last one: Removed unused params in Tank.fireCannon [Didn't see this problem earlier]
Added BulletController
More preferences updates

- Workspace specific preferences weren't exported
Bullets move forward, though some problems remain