all fromt pages working
Merge remote-tracking branch 'origin/master'