Families combo in new product form
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/es/lietsoftware/wwas/WWAS_UI.java