fix like-unlike issue
Warn before navigating away from unsaved form changes
Merge pull request #1097 from loomio/bug/like-button-disappearing

fix like-unlike issue
Merge pull request #1101 from loomio/safetynet

Warn before navigating away from unsaved form changes
ensure membership request aprroved notification renders properly
Merge pull request #1084 from loomio/bug/sticky-membership-reequest-accepted-notification

[ALMOST READY] ensure membership request approved notification renders properly
Merge branch 'master' into feature/flip-discussion

Conflicts:
	app/views/discussions/_add_comment.html.haml