Refactoring: Changed name of GalleryActivity
Merge branch 'master' of ssh://git@github.com/Torboto/cmput301W13T07.git

Conflicts:
	Team07RecipeFinder/AndroidManifest.xml