Merge pull request #448 from timschofield/develop

Develop
Merge pull request #449 from timschofield/develop

Optimise png files
Merge pull request #450 from timschofield/develop

Develop
Merge pull request #451 from timschofield/develop

added condition an item can't be related to itself
Replace gif file with png
Replace email.gif with email.png
Merge pull request #452 from fahadhatib/develop

Develop