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

Conflicts:
	service/api/register.js