Added layouts for large screens
Merge remote-tracking branch 'master/master'

Conflicts:
	res/layout-large/activity_main.xml