Remove redundant template blocks.
Remove redundant code.
Merge branch 'ckan_update_tests_pass_css_differ' of https://github.com/kata-csc/ckanext-kata into 221-import-from-xml
Simplify template, use inheritance.
Add icon.
Add first version of import xml  functionality. Unfinished.
Merge branch 'development' into 221-import-from-xml

Conflicts:
	ckanext/kata/plugin.py
	ckanext/kata/theme/templates/package/new.html
	ckanext/kata/theme/templates/package/read_base.html
Basic import xml  functionality.
Merge branch 'development' into 221-import-from-xml

Conflicts:
	ckanext/kata/controllers.py
	ckanext/kata/plugin.py
	ckanext/kata/theme/templates/package/read_base.html
Add basic upload own xml functionality.
Remove unused imports.
Basic upload own xml functionality ready.
Merge branch 'development' into 221-import-from-xml

Conflicts:
	ckanext/kata/controllers.py
Fix variable in exception.