Merge branch 'master' into crcxwc_sprint3
move files to js folder
remap moved files
Merge branch 'master' into crcxwc_sprint3
in progress, tray logic
example of code that executes once in update loop
Fixes merge conflicts