apdate befor pull
Merge branch 'master' into TK-01023
 merge with master branche