UI WIP
Merge branch 'following' of github.com:loomio/loomio into following

Conflicts:
	app/models/membership.rb
UI WIP