Redirect fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ekm/luxoft/view/controller/UploadFileController.java