add livestream holding image
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'origin/feature/showrca2014'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
wagtail version bump to 0.3.1
Always use 'self.show_index' when finding the show index page
Optimisation: Use programme count from cache rather than checking the database every time
We need to get the programme count every single time we reverse the URL.
This tiny change reduces the number of queries on the fashion landing page from 162 to 91
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'

Conflicts:
	django-verdant/requirements.txt
tidying cruft from pre-wagtail-separation days