Merge pull request #28 from sunny-mittal/nManos

N manos
user model fix
ground work for adding images to map icons