Refactored function names to match code guidelines
Updated comments in JS about wrapper classes
Removed the use of ID's from the javascript
Merge remote-tracking branch 'origin' into release