Merge pull request #716 from Yangqing/dev

Minor Code Cleaning

diff --cc include/caffe/layer.hpp
index 06518c2,3e386b3..6d2374f
--- 1/include/caffe/layer.hpp
--- 2/include/caffe/layer.hpp
+++ b/include/caffe/layer.hpp
@@@ -9,8 -9,9 +9,10 @@@
  #include "caffe/blob.hpp"
  #include "caffe/common.hpp"
  #include "caffe/proto/caffe.pb.h"
 +#include "caffe/util/device_alternate.hpp"
  
+ namespace caffe {
+ 
  using std::string;
  using std::vector;
  

diff --cc src/caffe/layers/bnll_layer.cpp
Simple merge

diff --cc src/caffe/layers/data_layer.cpp
Simple merge

diff --cc src/caffe/layers/image_data_layer.cpp
Simple merge

diff --cc src/caffe/layers/image_data_layer.cu
Simple merge

diff --cc src/caffe/layers/window_data_layer.cpp
Simple merge