add layout xml file
add layout xml file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/encodings.xml
add layout xml file