Merge pull request #10 from mayank2707/rails4

masonry changes
Merge pull request #11 from mayank2707/rails4

more changes for masonry to call masonry after all images have been loaded
deleted
added infinite scroll to conversation index page