merging with mike
Merge branch 'fridayEdition' of github.com:appiphony/Phillips into fridayEdition