Fixed bug where simple 2-point line segments would be skipped when
zoomed in far enough so one of the points was off-screen.
simplified if statement

Change-Id: I0488601a46587ea9bd30125c73aced304b62b102
Fix for feature request #1269. The SimpleAxisEditor now has a graphical
user interface for manipulating the tickCountRequested property of each
axis.
Brought back the "Browse Data" option. It is located under the Data menu
and turned off by default.
Bug #1323. The maxRows limit is now applied when the value is changed.
Implemented the code for Feature #1268. Users can now drag and drop CSV
files in Weave and the data import wizard will open up.
Merge remote-tracking branch 'origin/master' into CSVDrop
Fix for bug #1222. The ocean background now persists if the tools menu
is opened when it is enabled. The code for drawing the ocean background
needed to be delayed till the next frame.
The CSVImportWizard no longer has an unnecessary horizontal scroll bar
on the second window.
Merge remote-tracking branch 'origin/master' into new_foo