Merge branch 'change-log-format' into 'Milestone-3'

Fixed logging strings so they can now be indexed easier

See merge request !54