Merge branch 'ocd' of github.com:janastu/swtr into ocd

Conflicts:
	swtr/static/js/lib/custom-fields-plugin.js
	swtr/static/js/swtmaker.js
	swtr/templates/index.html