Saving .gitignore changes
Merge branch 'master' of https://github.com/soartech/simjr

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/soartech/simjr
(1) Added a removeLabel() method to the EntityShape object.
Fixed bug where EntityControllers were not being swapped correctly.

The manual entity controller previously tried to swap out only a single
other conflicting entity controller from the entity it was being applied
to. This fix means multiple existing entity controllers will be swapped
from an entity instead of just a single one.
Added capability to get Sim Jr props as java.util.Properties

git-svn-id: https://simjr.googlecode.com/svn/trunk@234 56382930-1720-11df-aca2-1133b060dc17
(1) Added a removeLabel() method to the EntityShape object.

git-svn-id: https://simjr.googlecode.com/svn/trunk@235 56382930-1720-11df-aca2-1133b060dc17
Fixed bug where EntityControllers were not being swapped correctly.

The manual entity controller previously tried to swap out only a single
other conflicting entity controller from the entity it was being applied
to. This fix means multiple existing entity controllers will be swapped
from an entity instead of just a single one.

git-svn-id: https://simjr.googlecode.com/svn/trunk@236 56382930-1720-11df-aca2-1133b060dc17
Merge remote-tracking branch 'trunk'
Addid seemingly necessary features to allow modifying the layout and adding a menu item to the toolbar.
Removed the adding of "(active)" to the active PVD's title. Changed the PVD lock feature to center on actual entity, rather than the shadow.
Unpolished changes to accomplish rotation for almost everything drawn to the PVD.

- Still code and comments that are in need of refinement.
- Known things that do not work properly yet: GridManager, dragging in the PVD when rotated.
Merge branch 'master' into cockpit
Add methods to force a left or right turn direction when computing the difference between two angles

git-svn-id: https://simjr.googlecode.com/svn/trunk@237 56382930-1720-11df-aca2-1133b060dc17
Add optional turn direction to flight controller, instead of always making the "shortest turn" (which is still the  default)

git-svn-id: https://simjr.googlecode.com/svn/trunk@238 56382930-1720-11df-aca2-1133b060dc17
Have Missile and AbstractFlyoutWeapon objects keep track of any associated AbstractFlyout objects they spawn, so information on the flyouts can end up on the Soar input link.

git-svn-id: https://simjr.googlecode.com/svn/trunk@239 56382930-1720-11df-aca2-1133b060dc17
Fixed a typo

git-svn-id: https://simjr.googlecode.com/svn/trunk@240 56382930-1720-11df-aca2-1133b060dc17
Regenerated classpath files from osgi settings
Added plugin user properties that get loaded in to the main properties (not default).
Needs to be cleaned up (is not DRY)
Refactored to reduce redundancy, added documentation, added another method for URL loading