APD-91: Refactoring JS/CSS Step 3 - final renaming
Merge branch 'APD-91-hla-refajs3' into develop