local commit 1.4

Added google maps instead of map kit and address made editable
Merge branch 'master' of https://github.com/sumantanf/NowFloat-Biz-Management

Conflicts:
	NowFloat Biz Management/AppDelegate.m
Local commit 1.4

Removed conficts