landing screen
Merge branch 'master' of https://github.com/kwv/Sandbox.git

Conflicts:
	res/layout/activity_landing_screen.xml