Set device_id at the begining of Solver.Init() to avoid using memory in the default GPU
Merge pull request #521 from sguada/set_device_id_at_init

Set device_id at the beginning of Solver.Init()
remove erroneous comment in ArgMaxLayer
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
There are 256 filters in conv2.

AlexNet paper splits conv2 into two GPU's, each with 128 filters. Reference paper: http://www.cs.toronto.edu/~fritz/absps/imagenet.pdf Applying #528 to dev instead of master per @Yangqing.
Merge pull request #529 from crizCraig/patch-3

Fix example text: there are 256 filters in conv2.
Added multi_label param to window layer to produce multiple binary labels per class
Added Multi_label_accuracy_layer it computes the average accuracy, for now it just compute the overal mean accuracy and cross entropy loss

Conflicts:
	src/caffe/proto/caffe.proto

Conflicts:
	src/caffe/proto/caffe.proto
Changed MultiLabelAccurcay to assume binary [0,1] labels

Computing sign is not good for binary [0,1]
Split accuracy into positive and negative