Adds trailing commas to models and fixtures
Merge branch 'develop'

* develop:
  Adds trailing commas to models and fixtures