Bug fix #25
Merge remote-tracking branch 'origin/PR25' into PR25

Conflicts:
	MyGoals/src/main/java/com/gloria/mygoals/ActivityListFragment.java