Merge branch 'master' of github.com:loomio/loomio into feature/public-groups-directory

* 'master' of github.com:loomio/loomio:
  fixes #823 makes discusssion disappear instantly
  refactor discussion_css
  add logic for case when no one has voted. fixes #781
  fix specs. TODO fix pending step on leave_group_steps
  fixes specs
  Filter discussion activity list for duplicates

Conflicts:
	db/schema.rb