Merge branch 'development'
Updated model names
Merge remote-tracking branch 'origin/development'