merge
Merge branch 'master' of https://github.com/CrowdStory/CrowdStory.git
work but no real progress
javascript commenting sizzle working (more or less)
Merge branch 'master' of https://github.com/CrowdStory/CrowdStory.git