again committing
Merge branch 'hongkun'

Conflicts:
	PintheCloud/GlobalKeys.cs