merged upstream/master
Fixed a couple things after the rebase.
Few changes to make CNNs work on Octave.
Few changes to make CNNs work on Octave.
Rebase.
Merge remote-tracking branch 'rasmus/master' into convnfix

Conflicts:
	tests/test_example_CNN.m
Solved conflict.
Indentation.
use single quotes for matlab compatibility
fix assertion
Minor changes

+ changed the scripts for CI.
+ tunned a bit the test parameters in test_example_CNN.
Switched CI to Octave 3.6.4
Minor changes to CI script

+ Removed the confirmation prompt in apt-get.
Merge pull request #66 from albertoandreottiATgmail/convnfix

convnfix
Delete octave-core
Merge remote-tracking branch 'upstream/master' into dimensions