UI Tab Framework
Changed MyActivity -> Lifemeter and Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/example/Lifemeter/MyActivity.java