Moved choice option template to attributes/includes.
Merge branch 'feature/configurable-products' into develop