Optimized version of code
Bootstrap working on staging
Edit css to display on other devices like iPad
Merge master