Removed FLAPPY_SPECIFIC_FAILURE by folding into OTHER_1_STAR_FAIL.
Merge branch 'master' of github.com:code-dot-org/blockly into feedback

Conflicts:
	src/flappy/levels.js
Moved message from common to flappy.
Moved translations from common/<LANG>.json to flappy/<LANG>.json.
Revert "Moved translations from common/<LANG>.json to flappy/<LANG>.json."

This reverts commit aa6b927b1148cff9c68e65f6ab17196d91f57fb5.
Added 2-star messages to isFeedbackMessageCustomized().
Merge pull request #631 from espertus/feedback

Feedback