update language rake and locale files
update roadie gem
Merge pull request #1203 from loomio/language-update

update language rake and locale files
archive discussions when group is archived
archive discussions in archived groups
Merge pull request #1210 from loomio/archive-discussions

Archive discussions
hotfix bad rich
Merge branch 'master' into discussion-privacy

Conflicts:
	db/schema.rb
wip
tests
js