Merge pull request #790 from stowellm/goat

implemented project ID, gps icon no longer pulling from desktop
Waffle images, API function block calls, Android updates