TC-870 Removed id from file, renamed fields
Merge pull request #187 from spawluk-bitbar/devel

TC-870 Removed id from file, renamed fields