closes icarus/mom-ca#15
modifications for icaruseu/mom-ca#165
minor changes for single charter view
Merge branch 'gs' of https://github.com/digsc/mom-ca into gs