Replace concierge objects with trait inheritance
Add cartoon content type to applications
Include single-picture and graphic type content
Move lookup out of image content controller
Merge branch 'master' of github.com:guardian/frontend into cartoon-articles

Conflicts:
	dev-build/conf/routes
Merge pull request #1910 from guardian/cartoon-articles

Add cartoon content type to applications