Merge remote-tracking branch 'origin/Iss67'

Conflicts:
	server/requests.js