Merge pull request #1 from reckart/master

Merging Richard's changes back into my fork.
When using a custom socketFactoryRegistry, also register plain HTTP
Merge pull request #2 from reckart/master

Added NOTICE file and updated license headers.
Merge pull request #2 from spaetow/master

Also register plain HTTP when using a custom socketFactoryRegistry