Added conv one-to-one edge in cpu fprop
merge update in convnet.h
merging changes made in github