index.html Mac OSX test edit
index.html test ec2 Linux edit
index.html test edit on Mac OSX
Merge branch 'develop' into staging
Merge branch 'staging'