added scroll page / header resize (need rework)  in main.js
Merge remote-tracking branch 'origin/dev' into dev