updates
Merge branch 'master' of github.com:unknownArtist/homeshop
message model and associations added
merge conflicts
merge conflicts fixed