Update gitignore
Merge branch 'master' into feature/merge
Updated CMPopTipView h and m files
Merge branch 'feature/merge'