more work done adding bootstrap to the frontend
Merge branch 'master' of https://github.com/opencart/opencart