upgrade bootstrap 3.1.1, put calculator in template, add backup
mejora en la calculadora
Merge branch 'master' into prod

* master:
  mejora en la calculadora
  upgrade bootstrap 3.1.1, put calculator in template, add backup