Added VC10 support.
Fixed callback ID bug in samples
Merge remote-tracking branch 'upstream/master' into scons