2
Merge branch 'feature0' into develop

Conflicts:
	newCode.c