Merge branch 'develop'

* develop:
  Develop commit
Master
Merge branch 'master' into develop

* master:
  Master

Conflicts:
	CodeFile.cs