Moving fulfilment notes to status and description
Merge branch 'relato'
Fixing conflict with relato branch in file promises_web/templates/verification_documents.html
Merge branch 'master' into 100dias

Conflicts:
	promises_web/templates/promise_detail.html
Merge branch '100dias'
Logo ciudadanoi
Ordering field for promises
Merge pull request #22 from ciudadanointeligente/promise_ordering

Ordering field for promises
Agrega iconos a grafico general.
Revert "Merge branch 'master' into 100dias"

This reverts commit a72b4a4b659d3c609c2142d52c50ef7c153d7527, reversing
changes made to c1aa76b85cc3fd2accb1e810d77977dd8cd76640.
Revert "Revert "Merge branch 'master' into 100dias""

This reverts commit bc8d109c43552736bf290f275167a7f2528cf73f.
Color icono half-accomplished
Merge branch 'master' into 100dias