Merge pull request #2 from kaltura/master

Merge from upstream
Add HAProxy configuration instructions
Merge pull request #142 from panda-os/master

HAProxy instructions