Committing update from request /scmvfs/.deployment
Committing update from request /scmvfs/service/table/readme.md
Committing update from request /scmvfs/service/scheduler/readme.md
Committing update from request /scmvfs/service/api/readme.md
Committing update from request /scmvfs/service/shared/readme.md
Committing update from request /scmvfs/service/extensions/readme.md
Committing update from request /scmvfs/service/scheduler/doorbellringlistener.js
Committing update from request /scmvfs/service/api/photo.js
Committing update from request /scmvfs/service/api/photo.json
Committing update from request /scmvfs/service/api/putobject.js
Committing update from request /scmvfs/service/api/putobject.json
Committing update from request /scmvfs/service/package.json
Merge branch 'master' of https://smartdoor.scm.azure-mobile.net/smartdoor

Conflicts:
	service/api/photo.js
	service/api/photo.json
	service/api/putobject.js
	service/api/putobject.json
	service/package.json