Merge remote-tracking branch 'origin/layout'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/layout'

Conflicts:
	.idea/workspace.xml