Merge pull request #3 from BlockadiaTeam/master

Update 2
Merge pull request #11 from pslam92117/master

.
Merge pull request #12 from BlockadiaTeam/master

Patrick branch
added PreviewPanel
PreviewPanel is finished
Nightly Commit
Updated Icons
80% done with Edit function
Nightly Update (Edit Function)
PreviewPanel finished
Reverted back to previous commit
PreviewPanel, Edit function, and Delete function fully implemented. The
Play and Build icons are updated.
Merge remote-tracking branch 'origin/Patrick-Branch'

Conflicts:
	Blockadia/bin/components/BlockShape.class
	Blockadia/bin/framework/Config.class
	Blockadia/bin/framework/GameModel.class
	Blockadia/bin/framework/GameSidePanel$1.class
	Blockadia/bin/framework/GameSidePanel$2.class
	Blockadia/bin/framework/GameSidePanel$3.class
	Blockadia/bin/framework/GameSidePanel$ButtonType.class
	Blockadia/bin/framework/GameSidePanel.class
	Blockadia/bin/framework/NewShapeWindowBuildPanel.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$1.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$2.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$3.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$4.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$5.class
	Blockadia/bin/framework/NewShapeWindowSidePanel.class
	Blockadia/jbox2d-library/target/classes/META-INF/maven/org.jbox2d/jbox2d-library/pom.properties
	Blockadia/jbox2d-serialization/target/classes/META-INF/maven/org.jbox2d/jbox2d-serialization/pom.properties
	Blockadia/src/components/BlockShape.java
	Blockadia/src/framework/Config.java
	Blockadia/src/framework/GameModel.java
	Blockadia/src/framework/GameSidePanel.java
	Blockadia/src/framework/NewShapeWindowBuildPanel.java
	Blockadia/src/framework/NewShapeWindowSidePanel.java
Issue #5 is fixed
Todo:
Final code-review and then merge the code into master
Reworked on BlockShape.(Issue #18)
Todo: 
1. Make a decision about switch grid resolution if we are going to keep
the drawn shape or not
2. Fix the bug about switching grid resolution in edit window
Rewrote BlockShape completely and edited most of the EditShapeWindow
classes and NewShapeWindow classes.
Fixed Issue #18, #17 and #9.
Waiting for code review
Fixed a small bug:
When clearing the build panel in EditShapeWindow, even if the build
panel is dirty, the user still can't save an empty shape
Merge remote-tracking branch 'origin/Game-Panel-Branch' into
New-Edit-Preview-Branch

Conflicts:
	Blockadia/bin/components/BlockShape.class
	Blockadia/bin/framework/Config.class
	Blockadia/bin/framework/NewShapeWindow$1.class
	Blockadia/bin/framework/NewShapeWindow.class
	Blockadia/bin/framework/NewShapeWindowBuildPanel$1.class
	Blockadia/bin/framework/NewShapeWindowBuildPanel$2.class
	Blockadia/bin/framework/NewShapeWindowBuildPanel.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$4.class
	Blockadia/bin/framework/NewShapeWindowSidePanel$5.class
	Blockadia/bin/framework/NewShapeWindowSidePanel.class
	Blockadia/bin/testDrivers/configTesting.class
	Blockadia/src/components/BlockShape.java
	Blockadia/src/framework/Config.java
	Blockadia/src/framework/NewShapeWindowBuildPanel.java
	Blockadia/src/testDrivers/configTesting.java