Added ability to group choice attribute options.
Merge branch 'feature/configurable-products' into develop

Conflicts:
	cartridge/attributes/models.py