Merge branch 'master' into develop

* master:
  Release: v1.9.6
Review @ Coding Standards.
case 2437 - States instead of JS. Cleanup for new exports later.
case 2437 - Image styles selection and processing.
case 2437 - Refreshed content type and iamge styles export.
Merge branch 'case-2538' into develop
Case 2600 - Fixed default value for image style.
Merge branch 'case-2600' into develop

* case-2600:
  Case 2600 - Fixed default value for image style.
Case 2490 - Fixed alt attribute for image.
Merge branch 'case-2490' into develop

* case-2490:
  Case 2490 - Fixed alt attribute for image.
Merge remote-tracking branch 'origin/develop'