Merge branch 'master' into dev
removed cache-control headers and changed text

cache-control headers are not passing W3C validation
Merge pull request #1 from shuyangli/dev

Dev