Merge pull request #604 from fsmanuel/master

fixes #596; adds ic-ajax to whitelist and includes ember-shim in index.html