c2
c3
Feature
Merge branch 'master' into uat

* master:
  Master hotfix

Conflicts:
	CodeFile.cs
Merge branch 'uat'

* uat:
  Feature
  c3
  c2