fix stats controller
large locale update (fixing broken html)
Merge pull request #1778 from loomio/locale_update

large locale update (fixing broken html)
Merge branch 'master' of github.com:loomio/loomio
Revert edit discussion inline changes
Merge branch 'angular'
fix fa
Add join group button
Add ENV variable for default route
Merge branch 'angular'
Allow users to raise proposals who aren't admins
Thread event images max 100%
Merge branch 'angular' of github.com:loomio/loomio
this is broken