Changed proto paths in makefile
*makefile can now deal with changed include in caffe_pretty_print
*added dependencies in CMake