Merge.
Added missing components to component.json properly. Fixed socket.io inclusion.
Added pause support to BlockingExecutorService and wrote tests for it.
More work on webadmin and other things.