Auto generate categories for system.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/scripts/controllers/main.js
	app/views/products/builder-options.html
	app/views/products/builder.html