Modular model definitions
Merge branch 'dev' of git@github.com:cypof/caffe.git into dev