Merge pull request #4 from swomma/master

Discharges, inactive unit, service record
Fixed comma positions in all headers, more consistency in format
some
Auto commit