Committing update from request /scmvfs/service/api/photo.js
Committing update from request /scmvfs/service/scheduler/doorbellListener.js
Merge branch 'master' of https://smartdoor.scm.azure-mobile.net/smartdoor

Conflicts:
	service/scheduler/doorbellListener.js
fix up after merge