Intermediate commit to merge master back into this branch.
Merge branch 'master' into 20131202_additionalSearch_feature
Changed search feature... changed check boxes to radio buttons for bottle types
Layout changes.  Search radio buttons in-line.