LPS-43320

We have the pull requests for 6.2.x, but we would like to merge your source format from master to those branchs manually since the code base is slightly different. We will send in the 6.2.x branch after we finish reviewing this.

The only biggest changes are in the main.js, where we moved all the javascript from jsp to the js file. I would like to review that portion with you.