Merge branch 'master' into FLOE-195
FLOE-195: Refactored the button click event function to make it more readable as well as a couple of other minor changes.
FLOE-195: Re-organized feedback and feedbackLoader components.
FLOE-195: Simplified bindButton() by moving some logic into the model listener listening "isActive".
FLOE-195: Made feedbackLoader itself a template loader.
FLOE-195: Replaced listenerMaker with listener keyword for events used in bindDialogTests.js
FLOE-195: Fixed unit tests for bindDialog component.
FLOE-195: Some code improvements.
FLOE-195: Replaced the direct markup manipulation with using a model and model listeners.
FLOE-195: Added comments and code clean up.
FLOE-195: Replaced the direct UI binding with the model binding.
Merge remote-tracking branch 'cindy/FLOE-195' into FLOE-196

Conflicts:
	src/components/feedback/js/bindDialog.js
	src/components/feedback/js/feedback.js