Feature/bundled products

Merge Bundled Products branch into master.