add second activity
Merge branch 'master' into TrucTran

Conflicts:
	.gitignore
	src/.classpath
	src/AndroidManifest.xml