Update combine_data script for OpenCV 3.0#29

Open

Rulikkk wants to merge 18 commits intophillipi:masterfrom

Commits on Nov 29, 2016

In the process of adding loss plotting to train.lua
brannondorsey
committed

Commits on Nov 30, 2016

Add display_plot env variable support in train.lua. errL1, errG, and errD can now be plotted to the display UI during training.
brannondorsey
committed
Add conditional check to make sure that display env is set before plotting errors.
brannondorsey
committed

Commits on Dec 6, 2016