Merge branch 'master' into John
main.js small reorganization in variable declarati

main.js small reorganization in variable declarations
main.js comments

main.js comments
Merge branch 'John'