Uploads
Merge branch 'master' of github.com:JVMartin/angel-workbench

Conflicts:
	workbench/angel/products