fix routing
Merge remote-tracking branch 'origin/Development' into Astron
Fix logout. Base JS libs in every page