add fakeimage
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api
Merge branch 'master' of github.com:DigitalResearchCentre/api

Conflicts:
	api/urls.py