Sync upstream caffe

[asnt]

Thanks for publishing this code.

Here is a sync of the upstream repository of caffe so deepcut now works on the latest cudnn 7. The proto has been adapted slightly, otherwise there was no merge conflict.