Merge branch 'master' into dev
Update validate protokol
Merge branch 'dev'