Merge branch 'origin/master'
Merge branch 'origin/master'
add front test template
Merge remote-tracking branch 'refs/remotes/origin/maks_fix'