Merge branch 'release-0.2.0'
Merge branch 'release-0.3.0'
Merge branch 'release-0.3.0' into develop
Add the S3 configuration file
Update the version number to 0.4.0
Update the gruntfile
Merge branch 'release-0.4.0'
Merge branch 'master' into gh-pages