FLOE-231: Save data when match or mismatch buttons are deactivated by clicking themselves.
FLOE-231: Fixed the code duplication.
FLOE-195: Code clean up.
Merge remote-tracking branch 'cindy/FLOE-231'

* cindy/FLOE-231:
  FLOE-195: Code clean up.
  FLOE-231: Fixed the code duplication.
  FLOE-231: Save data when match or mismatch buttons are deactivated by clicking themselves.
Merge branch 'master' into FLOE-196