APD-91: Refactoring JS/CSS Step 1
Merge branch 'APD-91-hla-refajs' into develop
APD-91: Refactoring JS/CSS Step 1