Avoid conflicts of finish button and form elements with name 'finish'
Correct price calculation for prices with quantity != 1 per price
Proper sorting and more clarity in picker descriptions
Filter bound options
Merge branch 'master' into options