Merge branch 'master' into prod

* master:
  upgrade abm
  new backup
  backup prod data
Merge branch 'master' into prod

* master:
  increment version
erge branch 'master' into prod

* master:
  fix sortdata from outside abm
Merge branch 'master' into prod

* master:
  fix action log
Merge branch 'master' into prod

* master:
  remove old notifications
Merge branch 'master' into prod

* master:
  remove more notification
Merge branch 'master' into prod

* master:
  fix bug in ID generation
  fix fonts in shared
Merge branch 'master' into prod

* master:
  integrate con birras que he tomado
  backup
Merge branch 'master' into prod

* master:
  changes in typeahead inputs from recipe tab
Merge branch 'master' into prod
Merge branch 'master' into prod

* master:
  add 65 and 75 minutes for hop aditions
  backup
  add backup
Merge branch 'master' into prod

* master:
  finish fist step of tools
  add calculator
  fix notification alignment in nav bar
Merge branch 'master' into prod

* master:
  fix minimizing
Merge branch 'master' into prod

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

* master:
  fix bug
add dilution to calculator
fix all