minor changes
fixed conflict
Merge branch 'master' of https://github.com/HerbalifeUX/Events
Merge branch 'master' of https://github.com/HerbalifeUX/Events
Merge branch 'master' of https://github.com/HerbalifeUX/Events