Merge HingeLoss and L2HingeLoss by adding hinge_norm to params

Conflicts:
	src/caffe/layers/loss_layer.cpp
	src/caffe/proto/caffe.proto
	src/caffe/test/test_l2_hinge_loss_layer.cpp
Removed L2HingeLoss class now a case within HingeLoss class

Conflicts:
	include/caffe/vision_layers.hpp
	src/caffe/layers/loss_layer.cpp
	src/caffe/proto/caffe.proto
	src/caffe/test/test_l2_hinge_loss_layer.cpp
Remove spaces and merge tests into one file

Conflicts:
	src/caffe/layers/loss_layer.cpp
	src/caffe/test/test_hinge_loss_layer.cpp
Fixed switch and test l2hingeloss

Conflicts:
	src/caffe/layers/loss_layer.cpp
	src/caffe/test/test_hinge_loss_layer.cpp
Fix the loss to follow the convention

Conflicts:
	src/caffe/layers/loss_layer.cpp
Unify L1 and L2 Hinge_Loss to follow convention
Remove C_ mentions, extra spaces and change hinge_norm to norm
Change hinge_norm to norm in test_hinge_loss
fix whitespace error in HingeLossLayer
explicitly name L1 hinge test
Merge pull request #398 from sguada/L2_hinge_loss