Merge branch 'master' into 100dias
Arreglo header, modal.
Arregla paddings de gráficos.
Merge branch 'master' into 100dias

Conflicts:
	promises_web/templates/promise_detail.html
Merge branch '100dias'