Graphic resources now display.
Added a button to verify that the update method works.
Merge branch 'master' into graphicresources
Fixed package conflict.
Merge branch 'master' into graphicresources