Merge pull request #79 from californiavol/master

merge from master
added embed action and view
Merge pull request #81 from californiavol/macbook-branch

Macbook branch
Merge pull request #82 from californiavol/imac-work

Imac work
Merge pull request #83 from californiavol/master

Merge master into imac-work