Merge remote-tracking branch 'origin/job_dispatcher_implementation' into task_manager_glued
Glue the TaskManager with JsInjector and JobDispatcher.
Fix indentation problems.
Merge remote-tracking branch 'origin/task_manager_glued' into development