Merge pull request #1 from dominicgoulet/master

Update from head repository
Merge branch 'master' of https://github.com/MartinGoulet/socializer
Merge branch 'master' of https://github.com/dominicgoulet/socializer
Merge branch 'master' of https://github.com/MartinGoulet/socializer
Merge branch 'master' of https://github.com/dominicgoulet/socializer
Using l18n for display time elapsed in activity.
Merge branch 'master' of https://github.com/dominicgoulet/socializer
Merge pull request #135 from acmetech/master

add TODO items for new shoulda-matchers expect syntax coming in the next release
Merge branch 'master' of https://github.com/dominicgoulet/socializer
Merge pull request #136 from acmetech/master

consistent quote type
consistent quote type
Added public, restricted and joinable sections for groups
Bit of styling for group pages
Merge pull request #130 from MartinGoulet/master

Using l18n for display time elapsed in activity.
leverage the scopes provided by enumerize and add some code headings