Resolve differences between master and production
Merge branch 'master' into transfer-to-master

Conflicts:
	assets/styles/socket.css
	assets/templates/lists.html
Warn when attempted unauthenticated access
Merge pull request #31 from iFixit/transfer-to-master

Resolve the differences between master and ks