Merge branch 'master' into Adam

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
Many changes, most of the tools working, still working on adding text
Jeremy - Added some small stuff; Load and Save items to menu, can load an image and draw on it, added two new classes to help filter image files
Merged with master, complete with all my latest updates.
Fixed the text tool - it works now!!
Merge remote-tracking branch 'origin/Adam'

Conflicts:
	Pantimator/src/pantimator/Canvas.java
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/Paintimator.java
Changed the way erase works - added undo and redo functionality!!!!
Added some magic...
Merge remote-tracking branch 'origin/Pres'

Conflicts:
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java
trying to fix things so I can merge with master...
conflict fixes, Long.compare and component mover not working for all
members
fixes
Merge branch 'Adam'

Conflicts:
	Pantimator/Pantimator.iml
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/ShapeWrapper.java
fixes
Merge branch 'master' into Kelly

Conflicts:
	Pantimator/src/pantimator/Drawable.java
	Pantimator/src/pantimator/LayeredPanel.java
	Pantimator/src/pantimator/LayeredPanelList.java
	Pantimator/src/pantimator/Paintimator.java
	Pantimator/src/pantimator/ShapeWrapper.java