merge with jake
Merge branch 'fridayEdition' of github.com:appiphony/Phillips into fridayEdition
added special popover