server models
merge
server models, fixed thumb sizes, merged