Merging form into chart component.
Merge branch 'charts-and-maps' of github.com:MastodonC/kixi.hecuba into charts-and-maps

* 'charts-and-maps' of github.com:MastodonC/kixi.hecuba:
  Removing Emacs lockfiles