Note role transitions in User Profile update summaries
Merge branch 'develop' into issue-73

Conflicts:
	connectors/users.php
Merge branch 'develop' into issue-73
issue-93: implements the UI for turning off private feeds
issue-93: adds label to checkbox fields
issue-93: make feed url in profile respect the Enabled setting on the settings page
Merge branch 'develop' into issue-93
Add links to field description, moving position of field
Trivial inline docs change
Simply prevent feeds functionality from loading if not enabled
Merge pull request #97 from x-team/issue-93

Issue 93: Add setting to enable/disable Stream feeds
Merge pull request #75 from x-team/issue-73

Note role transitions in User Profile update summaries
Merge branch 'develop'