Last minute commit, please no conflicts!
Conflict resolution 1/?
Conflict resolution 2/?
Merge pull request #3 from lnanek/alec/product-results-options-menu

Alec/product results options menu