Changes in develop
Merge branch 'develop'

Conflicts:
	myclass.cs