Deferred file reading
Delete old
Resolving conflicts
Merge branch 'long_polling'

Conflicts:
	JetPortal/src/main/java/cz/jet/controllers/ResultController.java