fix ask to join prompt for logged in users
make ask-user-to-join prompt work for logged in users
tidy language
Merge branch 'ask_to_join_hotfix' into rebuild-discussion-show

Conflicts:
	app/views/motions/_cast_vote.haml