Merge branch 'master' of github.com:loomio/loomio into nice-urls

Conflicts:
	db/schema.rb