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