Merge branch 'develop'

* develop:
  Add year to the display in summary.
  Correct summary of account.
  Correct computation of summary.
  Add test on evolution.