Improve extra_content handling in OfferingPainter and ResourcePainter
Remove django < 1.4 code
Fix some problems with test_gui_tutorials