added better content headers
updated date model to conform to #2, actually close #8
Merge branch 'master' of https://github.com/c4hrva/proxy-art
Resolved conflicts in server definition.
Merge branch 'stanzheng-master'