TC-823 Unified authors of files
Merge pull request #164 from spawluk-bitbar/devel

TC-823 Unified authors of files
Merge pull request #165 from bitbar/devel

TC-823 authors corrected