Code comit
Load more messages on scroll
Conflicts resolved and Assets C
Conflicts resolved
Merge branch 'master' of heroku.com:matchmakr
mearge
set