again committing
Merge branch 'hongkun'

Conflicts:
	PintheCloud/GlobalKeys.cs
THIS IS FINAL COMMIT Revert "Merge to rfrost"

This reverts commit fc48df6e3cdf928a9ee4307f6a05ae0cb306ce3e, reversing
changes made to 8161bb0f922cf43f33ec0c7addae0e817aa3a974.

Conflicts:
	PintheCloud/GlobalKeys.cs