Merge branch 'master' into development
first display version
first working upload and display version
updaeted
updated loader
Merge branch 'development'

Conflicts:
	imgproc/app/views/processing.scala.html