filter matrix validation
Merge branch 'development'
Merge branch 'master' into ivan_0.2
Merge branch 'ivan_0.2'
Merge branch 'development'

Conflicts:
	imgproc/app/views/processing.scala.html
Merge branch 'master' into development