Merge branch 'master' of github.com:pieper/SlicerDICOMHosting

Conflicts:
	readme.md
Merge branch 'master' of github.com:pieper/SlicerDICOMHosting

Conflicts:
	readme.md