Merge branch 'develop'
Added waves.min.js.map
Merge branch 'master' into gh-pages