news stories
corrected merge conflicts
Merge pull request #23 from dmitryjum/master

corrected merge conflicts
merge files
fix merge
updating Javascript for group show page
Merge branch 'master' into news_stories
news stories
cards display in connections
checkboxes appended
merged conflicts