Update gems
add subscription prompt

add content to the subscription prompt
added tag manager

insert env variable into javascript as string
Merge pull request #1230 from loomio/tag-manager

added tag manager
Merge pull request #1232 from loomio/update-gems

Update gems
Merge pull request #1218 from loomio/subscription-prompt

add subscription prompt
view and edit subscriptions in admin panel
Merge pull request #1235 from loomio/admin-subscriptions

view and edit subscriptions in admin panel
expose memberships on admin/user
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
Merge branch 'master' into fix-group-tree

Conflicts:
	app/views/groups/_options_dropdown.html.haml
Merge branch 'fix-group-tree' of github.com:loomio/loomio into fix-group-tree

Conflicts:
	Gemfile