new models/fields
Merge branch 'master' of github.com:vlad92z/Team-Fifty-Four