Mavericks fix

Change-Id: Ia615cd94d79504f09be451e9f3da7312c1ccbc8b
Update protobuf to bring in protobuf fixes.

Change-Id: Ic98b8866218411ecc82991dca6c53b038db10a32
Add additional parameters for the Calculator filter.

Enable Calculator to generate normals and texture coordinates.

Change-Id: I4d5a8c9230258b0553e1ffd5b18885b2eb0c92ec
Add sensible default manipulators for 2D interaction.

I got this patch from the bug tracker, where Zach Mullen had attached
it.  The point is to provide some basic manipulators when in 2D viewing
mode.  The bug is here:  http://paraview.org/Bug/view.php?id=14171

Change-Id: I5c87223ead2e6539f28c3981cbe83d4722702062
Merge topic '14294-calculator-normals-tcoords'

af1b8d1 Add additional parameters for the Calculator filter.
Merge topic 'add-zachs-sensible-default-2d-manipulators'

2fa810c Add sensible default manipulators for 2D interaction.
Merge topic 'patch-mavericks'

13a214c Update protobuf to bring in protobuf fixes.
a6c2335 Mavericks fix