update code
Merge branch 'master' of https://github.com/tinigon89/CountryGrocer

Conflicts:
	iOS
Version/CountryGrocer/CountryGrocer/en.lproj/MainStoryboard_iPad.storybo
ard