Merge topic 'vtk_master_04_11_2014' into pv-master

f44d754c Merge topic 'ghost-points-support' into master
63b17d65 Merge topic 'catalyst-web-estimate' into master
0607cc53 Catalyst-Web estimate UI fix
b6f86225 Merge topic 'catalyst-web-estimate' into master
794807f6 Add cost estimate for Catalyst Web
e112ba8f Merge topic 'cocoa-arc' into master
02d690c7 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
ce692f85 Merge topic 'custom-TestTM3DLightComponents-timeout' into master
1de7c32b Allow custom TestTM3DLightComponents timeout
7e252a2a Merge topic 'view-setings' into master
79ebd46f Merge topic 'fix-unittest-dashboard' into master
bcb33444 Add #error when trying to build as Cocoa ARC
0adb5f1a fix variety of dashboard problems
5000f77d Merge topic 'Windent-unneeded-if' into master
ad14e44c Remove unnessary 'if' before 'delete[]'
c03cd57c Merge topic 'carbon-utf8' into master
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I5cc51b7ba563873469ac8c188c877bb1bf948539
Fixed linkage problem in Windows

Change-Id: I66f0cc98129cb70aae15d94cdbf19dc2d5839f55
Improved comment handling

There were some problems with how comments were read and written.
Fixed these problems for comments that precede a value. These
changes were submitted upstream to jsoncpp, but have not been
merged (see http://sourceforge.net/p/jsoncpp/patches/25/).

Change-Id: I6235519a21d6897eb81a3987835794acf4844167
Merge topic 'jsoncpp-improvements' into master

d4d486aa Improved comment handling
36d9e0ec Fixed linkage problem in Windows
preserve R data.frame row names

When converting from an R data.frame to a vtkTable, store their
row names (if any) in a string column at the beginning of the table.

Change-Id: Ie9bc73a8c83ae7aec46ce05bc0de849a1c0f3da2
Merge topic 'dataframe_rownames' into master

c06dd72d preserve R data.frame row names