Added the option to run global orientation (Surf::getOrientationGlobal)  with different Haar Response weights. Note that the default before adding this was not to weight the responses at all, and this has been kept as the default by means of a default argument to that function.
Fixed Gaussian centering for global orientation
Fixed conflicts
Merge branch 'improved_global_haar_wavelets'

Fixed merge conflicts.