Same Commit
Merge branch 'master' of https://github.com/ashokdy/TipApplause_TeamWork

Conflicts:
	TipApplause/EventSettingsViewController.m
New