added image controller
fixed image controller
Fixed
added display
Merge branch 'development'
Merge remote-tracking branch 'origin/ivan_0.1'
Merge branch 'master' into development
fixed show histogram button
Merge branch 'development'
updated display image
Merge branch 'master' into development
first display version
first working upload and display version
updaeted
updated loader
revert
Merge branch 'development'

Conflicts:
	imgproc/app/views/processing.scala.html
conflict solved
updated create folder uploads if not exist
Merge branch 'development'