finish Popervers (product, provider, --> skull, warehouse, ...)
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/startup.coffee