schema udpated
Merge remote-tracking branch 'origin/master'
conflicts resovled
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
server side complete - deleted all scaffolds and used just user and message models and controllers