office machine conflict resolved
Merge branch 'master' of https://github.com/tusharmaroo/today1

Merging mainly touched area is New Person and New Project modal.