merge
Merge branch 'master' of https://github.com/gofindittechnologies/gfi_ios-mini

Conflicts:
	Mini/Mini.xcworkspace/xcshareddata/Mini.xccheckout
some map
Merge branch 'master' of https://github.com/gofindittechnologies/gfi_ios-mini

Conflicts:
	Mini/Mini.xcworkspace/xcshareddata/Mini.xccheckout