Merge branch 'master' of https://github.com/mavericks065/mobileserviceserver

Conflicts:
	.project