Merge branch 'master' of D:\Business\Mirpix\Project-Template\workflow\repository\github with conflicts.
= update after project