From avatarId to avatarModel
Fixed string to int bug
Merge branch 'controller' of github.com:morganwilde/applepoker