Add Housing patterns layout
Merge branch 'master' into develop

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