mike's edits
Merge branch 'master' of github.com:cmerdctech/com.cmerdc.demo.viewpoint
mike edits