Fixed issue #487.
Fixed the DebugTokenDialog close button (issue #487 for VS2012 and 2013)
Merge pull request #560 from blackberry/next-487

Fixed issue #487.