Make sure call rest apis return successfully rather than timing out
Use 204 instead of 200 for responses as the responses don't need a body
Merge branch 'master' into 504_fixes

Conflicts:
	server/presence.js
Merge pull request #279 from Standard8/504_fixes

Make sure call rest apis return successfully rather than timing out