Merge branch 'fix_convolutionlayer_bug' into 'master'

Fix convolution layer bug

See merge request !7
2 jobs for master in 5 minutes and 5 seconds (queued for 1 second)