update
Merge branch 'dev' of github.com:RazvanRanca/caffe into dev