Merge with upstream on codeplex.

- Merged revision 20516-20657 from Vangi.
- Moved Highstock samples in their own separate area from the others.
- Refactored classes to be consistent with modifications upstream.