ddd
Merge branch 'smth2' into develop

Conflicts:
	.settings/org.eclipse.core.resources.prefs