minor changes, some javadoc comments.
Merge remote-tracking branch 'jcoady9/master'
Merge remote-tracking branch 'sbonner1/master'
added some images to test gridview