finished prototyping cocoa from customer home.
Merge branch 'develop'
Merge branch 'master' of https://github.com/samba6/saanu-proj