Waffle images, API function block calls, Android updates
Merge pull request #792 from stowellm/goat

Waffle images, API function block calls, Android updates