Merge pull request #26 from jcote008/JcoteFork

ItemManager Panel Done* - Merged 04/02/14
Scene Window Changes/Additions

Item: Added a toString for easy JList viewing

Scene: Cleaned up getters and setters so they are more readable.

AddItemWindow: Added a drop down menu that allows the user to choose the
method in which the item will be added to the scene.  To do:
Implementation of the add item window.

EditSceneWindow: Added functionality for the Add Item button, which
opens the AddItemWindow.  Also added a function that AddItemWindow can
call to indicate to EditSceneWindow that it has closed, re-enabling the
Add Item Button.

MainWindow: Not sure, but it says I editted it.

- Tyrone
Merge pull request #27 from TyroneLagore/master

Scene Window Changes/Additions - merged 04/04/14
update to be able to merge
Merge remote-tracking branch 'upstream/master' into ChrisBranch

Conflicts:
	bin/Windows/EditSceneWindow$1.class
	bin/Windows/EditSceneWindow$2.class
	bin/Windows/EditSceneWindow$ButtonHandler.class
	bin/Windows/EditSceneWindow.class
Created SceneInfoWindow

SceneInfoWindow:
- just a GUI for viewing a given Scene's information
- for use when in edit item window to see the scene an item may be in

- Chris
Created SceneInfoWindow
Merge pull request #28 from ChrisGonzalez1/ChrisBranch

Chris branch - Merged 04/05/14