merged from central repo
remove redundant js file, alerts in main.js
Remove master keys
merged from alehander42