fixed path in image controller
Merge branch 'development'
Merge remote-tracking branch 'origin/ivan_0.1'

Conflicts:
	imgproc/app/controllers/Image.java
fixed conflict
Merge branch 'master' into development
fixed display image
added modal display after sent mail