Merge branch 'master' of D:\softwareProjects\sky with conflicts.
Fix sale
Fix sale