Merge changes
Merge branch 'master' of https://github.com/raviNowFloats/NowFloat-Biz-Management

Conflicts:
	NowFloats Biz Management.xcodeproj/project.pbxproj