Merge pull request #1230 from hugy718/dev-postgresql

Add convolution prototype network used in TED project