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
Updated SceneInfoWindow

SceneInfoWindow:
- fixed bug
- added dispose() when closing window

Also:
- accidently adjusted bounds of EditSceneWindow when testing size of
windows (sorry I touched your shit Tyrone)
Merge pull request #29 from ChrisGonzalez1/ChrisBranch

Updated SceneInfoWindow - Merged 04/05/14
Added a test case for launching the SceneInfoWindow

The test isn't working.  Uploading to have Chris test why it's not
working.  The test runs by clicking the dropscene label in the edit item
window.  The code is on EditItemWindow (lines 78-91).
Merge pull request #30 from jcote008/JcoteFork

Added a test case for launching the SceneInfoWindow - Merged 04/05/14
Merge branch 'master' of https://github.com/jcote008/assignment3

Conflicts:
	src/Windows/EditItemWindow.java
Merge pull request #33 from TyroneLagore/master

Text Aesthetics Update - Merged 04/07/14
- Updated Scene sequence diagrams to what we have.
- Minor edits in SceneInfoWindow
Merge remote-tracking branch 'upstream/master' into ChrisBranch

Conflicts:
	bin/.gitignore
Updated EditItemWindow functionality

Gave ability for SceneInfoWindow to return visibility to EditItemWindow.
added functionality to launch scene info window when a linked scene
label is clicked and the linked scene isn't null.
Merge pull request #35 from jcote008/JcoteFork

Updated EditItemWindow functionality - Merged 04/07/14
Merge pull request #34 from ChrisGonzalez1/ChrisBranch

Updated Sequence Diagrams - Merged 04/07/14
Merge pull request #36 from TyroneLagore/master

AGHASDGASHDAS - Merged 04/08/14 (Note: Pull Request Title is fucked up).