Change logo to jpg
Merge branch 'Richard' into dev