Merge pull request #421 from fahadhatib/develop

Develop
Merge pull request #422 from fahadhatib/develop

Fixes the problem of translated items not being changed
Merge pull request #423 from fahadhatib/develop

Fix errors resulting from price matrix work
Merge pull request #424 from fahadhatib/develop

Fix bugs while importing serial numbers from files
Begin the work of moving all branding information to a separate file
Merge pull request #425 from timschofield/develop

Begin the work of moving all branding information to a separate file