Removed excess code from gridadapadter
Creating current screen
Merged
upload fragment, upload activity, camera activity, networkPostPicture
changed upload to fragment
Merged Eric and Grant
Merge branch 'master' of https://github.com/gcs278/zonesnap.git into
brad

Conflicts:
	res/layout/activity_picture_view.xml

Also successful testing of picture view, just need to figure out how to
access the button.