merge
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	GZService.v11.suo
makeuper list