Added second activity
Merge branch 'experimental'

Conflicts:
	res/values/strings.xml