Push Michael's changes to heroku
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome
staging stories edit for ajax
staging stories edit for ajax