Merge branch 'master' into gh-pages
Gold and Bronze App Uploads. CRUD!!!! NO BUENO!!!
Merge branch 'gh-pages'