Merge branch 'master' of https://github.com/echandler/inmateWorkers

Conflicts:
	website/javascript/test.min.js