Commit 655fc338ac276e7bc4d2013a5f9381f27057b834

  • Tree SHA1: 037b90a
  • Parent SHA1: 0bce307 (Fix UI issues)
  • Parent SHA1: d31dd4d (Merge branch 'master' of github.com:janastu/swtr) 
Merge branch 'master' into persona

Resolve Conflicts:
	swtr/static/js/swtmaker.js
	swtr/templates/index.html