fix staging config, tidy up old migration
Merge pull request #1239 from loomio/fix-migrations

Fix migrations
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
don't show subscription prompt to groups with -zsh subscription
fix failing spec. sniffy
fix new discussion bug when no group selected
Merge branch 'master' into bug/layout

Conflicts:
	app/views/groups/_title.html.haml