Added google maps for finding location
Merge remote-tracking branch 'origin/master'

Conflicts:
	PigletStorage/res/values/strings.xml