linki
Merge branch 'filling-in-layout'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml