Merged 'index.html' and 'js/main.js' from 'release' branch