fix spec
try to limit memory usage in activity email
change group max size default to 1000
change group max size default to 1000
Merge branch 'master' of github.com:loomio/loomio

Conflicts:
	db/migrate/20140616022958_change_group_max_size_default.rb
Merge branch 'master' into update-discussion-counts