Fix issues preventing an ampersand or apostrophe being used in supplier code
New icon for file uploads
Merge pull request #74 from timschofield/develop

Develop