Proxy Server now working, except for PDF Files
Merge remote-tracking branch 'origin/master'