Reconcile caffe with upstream caffe

[mtourne]

GPU & Matlab integration should be tested.

[bittnt]

@mtourne Thanks for this. Did you test python script? It seems to be broken.

[mtourne]

Could you please explicit what you mean by this. As-in, provide an error trace ?

It works great for me, but CPU only. Again, not tested on GPU.

[mtourne]

Now added gpu support.

[ahundt]

@mtourne can you incorporate the new training scripts from master?
@bittnt any chance of merging this?

[ahundt]

@mtourne I tried building your branch and got quite a few compiler errors
build_log.txt

I'm on ubuntu 14.04, (there were linker errors but those would be easy to resolve after the compiler errors)

[bittnt]

@mtourne @ahundt Thanks for your guys help and work. I have done a new version update see the pull request. It has passed various test on my side. Let me know if it works for you guys? Thanks very much!

[mtourne]

@bittnt I don't have the bandwidth to work on this actively. This was done so you (the author I presume) can try out the branch, and see that it's not very much work to build on top of actual-Caffe.