fixed comment style according to guidelines
Merge branch 'master-bridge-readability1' into local-master
fixed js errors/warnings
patched version for local branch