fix
Merge branch 'refs/heads/master' into Stage1

Conflicts:
	PushNotificationServer/PushNotificationService/PushNotificationService.svc.cs