Update test for changes in previous.
Centralise loading of jquery in an included snippet, so we don't have to maintain the jquery version number in 5 places.
Merge branch 'next' into tabbed_options

* next:
  Centralise loading of jquery in an included snippet, so we don't have to maintain the jquery version number in 5 places.
  Update test for changes in previous.

Conflicts:
	feincms/templates/admin/feincms/item_editor.html