Commit d31dd4d8f349667336d1fc66b3a388488bd5bb90

Anon Ray
Thu Jun 05 11:33:20 IST 2014

Tree SHA1: b7ce6d3
Parent SHA1: d17d1d0 (Merging from master branch on git.pantoto.org)
Parent SHA1: 02fe070 (correction to popup box html template)

Merge branch 'master' of github.com:janastu/swtr

Resolve Conflicts:
	swtr/static/js/swtmaker.js

Also fixed some indentation issues.