add discussion level privacy
Merge pull request #1192 from loomio/discussion-privacy

Discussion privacy
hotfix
hotfix
Merge branch 'master' of github.com:loomio/loomio
make discussion inherit group privacy on creation if no privacy set by user
More hotfixes tonight
remove debug line
create readable-unguessable-urls for discussions groups users motions
Merge pull request #1242 from loomio/readable-unguessable-urls

create readable/unguessable urls
hotfix m redirector
Merge branch 'master' into angular-master

Conflicts:
	app/services/discussion_service.rb
	config/routes.rb
	db/schema.rb
	spec/models/ability_spec.rb
	spec/models/motion_spec.rb
	spec/models/vote_spec.rb
	spec/services/discussion_service_spec.rb
fix
EventService rises