my update
Merge remote-tracking branch 'GitHub/master'

Conflicts:
	src/com/shirley/calstrack/LearnActivity.java