Minor commits to allow fetch.
Merge branch 'prod' of https://github.com/ssachan/v2 into prod

Conflicts:
	client/js/Manager.js