Merge branch 'release/1'
Fixing links for non-root domains
Fixing merge
Fixing JS errors
Removing log messages
Merge branch 'hotfix/1.0.1' into develop