Do some pylinting
Merge remote-tracking branch 'origin/feature/fields_refactor' into feature/fields_refactor

* origin/feature/fields_refactor:
  copy.deepcopy should be used to avoid altering db objs)
Add support for differentiating between template fields and normal ones