bootstrap 3 updates, and a fix to the cart page where it was displaying two drop downs
Merge branch 'master' of github.com:zuha/Catalogs-Zuha-Cakephp-Plugin